Changeset 15

Timestamp:

05/18/04 02:28:11 (5 years ago)

Author:

brad

Message:

Used DMD 0.89 to continue the Forward References battle. Also got rid of C-style casts that the compiler was barfing on. Got rid of some junk, like the 'all.d' files in each folder. Also, began using SCons as the build tool. Implemented more of the widget files, and stopped when trying to compile widget.d outside of Eclipse at a prompt. Start there.

Files:

• branches/0.1/HelloWorld.d (deleted)
• branches/0.1/hello (deleted)
• branches/0.1/obj (deleted)
• branches/0.1/src/HelloDWT.d (added)
• branches/0.1/src/SConstruct (added)
• branches/0.1/src/dwt/accessibility/accessible.d (added)
• branches/0.1/src/dwt/dwtmain.d (deleted)
• branches/0.1/src/dwt/graphics/IDrawable.d (added)
• branches/0.1/src/dwt/graphics/all.d (deleted)
• branches/0.1/src/dwt/graphics/color.d (modified) (2 diffs)
• branches/0.1/src/dwt/graphics/cursor.d (modified) (1 diff)
• branches/0.1/src/dwt/graphics/font.d (modified) (1 diff)
• branches/0.1/src/dwt/graphics/fontdata.d (modified) (2 diffs)
• branches/0.1/src/dwt/graphics/gc.d (modified) (5 diffs)
• branches/0.1/src/dwt/graphics/image.d (modified) (12 diffs)
• branches/0.1/src/dwt/graphics/imagedata.d (modified) (44 diffs)
• branches/0.1/src/dwt/graphics/point.d (modified) (1 diff)
• branches/0.1/src/dwt/graphics/region.d (modified) (1 diff)
• branches/0.1/src/dwt/internal/all.d (deleted)
• branches/0.1/src/dwt/internal/compatibility.d (modified) (4 diffs)
• branches/0.1/src/dwt/internal/gtk/os.d (modified) (2 diffs)
• branches/0.1/src/dwt/internal/win32/all.d (deleted)
• branches/0.1/src/dwt/internal/win32/os.d (modified) (2 diffs)
• branches/0.1/src/dwt/internal/win32/shactivateinfo.d (added)
• branches/0.1/src/dwt/internal/win32/tchar.d (modified) (1 diff)
• branches/0.1/src/dwt/internal/win32/windowpos.d (added)
• branches/0.1/src/dwt/util/all.d (deleted)
• branches/0.1/src/dwt/util/string.d (modified) (8 diffs)
• branches/0.1/src/dwt/util/stringclass_old_01.d (deleted)
• branches/0.1/src/dwt/util/throwable.d (added)
• branches/0.1/src/dwt/util/util.d (modified) (1 diff)
• branches/0.1/src/dwt/widgets/all.d (deleted)
• branches/0.1/src/dwt/widgets/button.d (modified) (2 diffs)
• branches/0.1/src/dwt/widgets/caret.d (modified) (4 diffs)
• branches/0.1/src/dwt/widgets/composite.d (modified) (6 diffs)
• branches/0.1/src/dwt/widgets/control.d (modified) (3 diffs)
• branches/0.1/src/dwt/widgets/decorations.d (modified) (1 diff)
• branches/0.1/src/dwt/widgets/display.d (modified) (61 diffs)
• branches/0.1/src/dwt/widgets/event.d (modified) (1 diff)
• branches/0.1/src/dwt/widgets/item.d (modified) (5 diffs)
• branches/0.1/src/dwt/widgets/layout.d (added)
• branches/0.1/src/dwt/widgets/monitor.d (modified) (1 diff)
• branches/0.1/src/dwt/widgets/runnablelock.d (added)
• branches/0.1/src/dwt/widgets/scrollable.d (modified) (15 diffs)
• branches/0.1/src/dwt/widgets/shell.d (modified) (20 diffs)
• branches/0.1/src/dwt/widgets/synchronizer.d (added)
• branches/0.1/src/dwt/widgets/widget.d (modified) (24 diffs)
• branches/0.1/src/dwt/widgets/widgets.d (deleted)

branches/0.1/src/dwt/graphics/color.d

@@ -149 +149 @@
-    if (object == this) return true;
-// TODO: deal with instanceof       if (!(object instanceof Color)) return false;
-
+cast
-    return device == color.device && (handle & 0xFFFFFF) == (color.handle & 0xFFFFFF);
-}
@@ -254 +254 @@
-    byte[] entry = new byte[4];
-    OS.GetPaletteEntries(hPal, index, 1, entry);
-(byte)red) && (entry[1] == 
-
+cast(byte)red) && (entry[1] == cast
+cast
-            /* Found the color. Increment the ref count and return */
-            colorRefCount[index]++;

branches/0.1/src/dwt/graphics/cursor.d

@@ -55 +55 @@
-     */
-    static final byte[] HAND_SOURCE = [
-(byte)0xf9,(byte)0xff,(byte)0xff,
-(byte)0xf0,(byte)0xff,(byte)0xff,
-(byte)0xf0,(byte)0xff,(byte)0xff,
-(byte)0xf0,(byte)0xff,(byte)0xff,
-(byte)0xf0,(byte)0x3f,(byte)0xff,
-(byte)0xf0,(byte)0x07,(byte)0xff,
-(byte)0xf0,(byte)0x03,(byte)0xff,
-(byte)0xf0,(byte)0x00,(byte)0xff,
-
-(byte)0x10,(byte)0x00,(byte)0x7f,
-(byte)0x00,(byte)0x00,(byte)0x7f,
-(byte)0x80,(byte)0x00,(byte)0x7f,
-(byte)0xc0,(byte)0x00,(byte)0x7f,
-(byte)0xe0,(byte)0x00,(byte)0x7f,
-(byte)0xf0,(byte)0x00,(byte)0x7f,
-(byte)0xf8,(byte)0x00,(byte)0xff,
-(byte)0xfc,(byte)0x01,(byte)0xff,
-
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
-(byte)0xff,(byte)0xff,(byte)0xff,
+cast(byte)0xf9,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0x3f,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0x07,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0x03,cast(byte)0xff,cast
+cast(byte)0xf0,cast(byte)0x00,cast(byte)0xff,cast
+
+cast(byte)0x10,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0x80,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0xc0,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0xe0,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0xf0,cast(byte)0x00,cast(byte)0x7f,cast
+cast(byte)0xf8,cast(byte)0x00,cast(byte)0xff,cast
+cast(byte)0xfc,cast(byte)0x01,cast(byte)0xff,cast
+
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
+cast(byte)0xff,cast(byte)0xff,cast(byte)0xff,cast
-    ];
-    static final byte[] HAND_MASK = [
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x06,(byte)0x00,(byte)0x00,
-(byte)0x06,(byte)0x00,(byte)0x00,
-(byte)0x06,(byte)0x00,(byte)0x00,
-(byte)0x06,(byte)0x00,(byte)0x00,
-(byte)0x06,(byte)0xc0,(byte)0x00,
-(byte)0x06,(byte)0xd8,(byte)0x00,
-(byte)0x06,(byte)0xd8,(byte)0x00,
-
-(byte)0x07,(byte)0xdb,(byte)0x00,
-(byte)0x67,(byte)0xfb,(byte)0x00,
-(byte)0x3f,(byte)0xff,(byte)0x00,
-(byte)0x1f,(byte)0xff,(byte)0x00,
-(byte)0x0f,(byte)0xff,(byte)0x00,
-(byte)0x07,(byte)0xff,(byte)0x00,
-(byte)0x03,(byte)0xfe,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
-(byte)0x00,(byte)0x00,(byte)0x00,
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0xc0,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0xd8,cast(byte)0x00,cast
+cast(byte)0x06,cast(byte)0xd8,cast(byte)0x00,cast
+
+cast(byte)0x07,cast(byte)0xdb,cast(byte)0x00,cast
+cast(byte)0x67,cast(byte)0xfb,cast(byte)0x00,cast
+cast(byte)0x3f,cast(byte)0xff,cast(byte)0x00,cast
+cast(byte)0x1f,cast(byte)0xff,cast(byte)0x00,cast
+cast(byte)0x0f,cast(byte)0xff,cast(byte)0x00,cast
+cast(byte)0x07,cast(byte)0xff,cast(byte)0x00,cast
+cast(byte)0x03,cast(byte)0xfe,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
+cast(byte)0x00,cast(byte)0x00,cast(byte)0x00,cast
-    ];
-

branches/0.1/src/dwt/graphics/font.d

@@ -162 +162 @@
-    if (object == this) return true;
-// TODO: instanceof     if (!(object instanceof Font)) return false;
-
+cast
-    return device == font.device && handle == font.handle;
-}

branches/0.1/src/dwt/graphics/fontdata.d

@@ -258 +258 @@
-    if (object == this) return true;
-// TODO: instanceof     if (!(object instanceof FontData)) return false;
-
+cast
-    LOGFONT* lf = fd.data;
-    return data.lfCharSet == lf.lfCharSet &&
@@ -309 +309 @@
-    int [] lpCs = new int[8];
-    OS.TranslateCharsetInfo(cp, lpCs, OS.TCI_SRCCODEPAGE);
-
+cast
-        return 0;
-}

branches/0.1/src/dwt/graphics/gc.d

@@ -26 +26 @@
-    import dwt.graphics.rgb;
-
-    import dwt.util.util;
-
-    import dwt.internal.win32.all;
-    import dwt.internal.compatibility;
+
+    import dwt.internal.win32.iconinfo;
+    import dwt.internal.win32.os;
+    import dwt.internal.win32.rect;
+    import dwt.internal.win32.tchar;
+    import dwt.internal.win32.textmetric;
+    import dwt.internal.win32.types;
+    
-    import dwt.util.util;
-
@@ -841 +846 @@
-                byte oldValue = pBits[0];
-                int mask = (0xFF << (8 - bm.bmBitsPixel)) & 0x00FF;
-
+cast
-                OS.MoveMemory(bm.bmBits, pBits, 1);
-                int color = OS.GetPixel(srcHdc, 0, 0);
@@ -856 +861 @@
-                byte[] newColors = new byte[oldColors.length];
-                transRed = transGreen = transBlue = 0xff;
-
-
-
+cast
+cast
+cast
-                OS.SetDIBColorTable(srcHdc, 0, maxColors, newColors);
-                originalColors = oldColors;
@@ -1652 +1657 @@
-        trivertex[0].x = x;
-        trivertex[0].y = y;
-
-
-
+cast
+cast
+cast
-        trivertex[0].Alpha = -1;
-        //OS.MoveMemory(pVertex, trivertex, TRIVERTEX.sizeof);
@@ -1660 +1665 @@
-        trivertex[1].x = x + width;
-        trivertex[1].y = y + height;
-
-
-
+cast
+cast
+cast
-        trivertex[1].Alpha = -1;
-        //OS.MoveMemory(pVertex + TRIVERTEX.sizeof, trivertex, TRIVERTEX.sizeof);

branches/0.1/src/dwt/graphics/image.d

@@ -281 +281 @@
-            /*byte[] rgbBwBitmapInfo = {
-                40,0,0,0, //  biSize
-
-
-
-
-
-
-
-
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
-                1,0, //  biPlanes
-                1,0, //  biBitCount
@@ -298 +298 @@
-                0,0,0,0, //  biClrImportant
-                0,0,0,0, //  First color: black
-(byte)0xFF,(byte)0xFF,
+cast(byte)0xFF,cast(byte)0xFF,cast
-            };*/
-
@@ -512 +512 @@
-                        blue = (blueShift < 0) ? blue >>> -blueShift : blue << blueShift;
-                        newData.data[offset++] =
-
+cast
-                    }
-                }
@@ -782 +782 @@
-    bmiHeader.biHeight = -height;
-    bmiHeader.biPlanes = 1;
-
+cast
-    if (useBitfields) bmiHeader.biCompression = OS.BI_BITFIELDS;
-    else bmiHeader.biCompression = OS.BI_RGB;
@@ -799 +799 @@
-                    blueMask = 0x1F;
-                    //  little endian
-
-
-
-
-
-
-
-
-
-
-
-
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
-                    break;
-                case 32:
@@ -817 +817 @@
-                    blueMask = 0xFF000000;
-                    //  big endian
-
-
-
-
-
-
-
-
-
-
-
-
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
-                    break;
-                default:
@@ -836 +836 @@
-    } else {
-        for (int j = 0; j < rgbs.length; j++) {
-
-
-
+cast
+cast
+cast
-            bmi[offset + 3] = 0;
-            offset += 4;
@@ -936 +936 @@
-            byte oldValue = pBits[0];
-            int mask = (0xFF << (8 - bm.bmBitsPixel)) & 0x00FF;
-
+cast
-            OS.MoveMemory(bm.bmBits, pBits, 1);
-            int color = OS.GetPixel(hdcMem, 0, 0);
@@ -1139 +1139 @@
-                //  First color black, second color white
-                int offset = BITMAPINFOHEADER.size;
-
+cast
-                bmi[offset + 7] = 0;
-
@@ -1550 +1550 @@
-    bmiHeader.biHeight = -i.height;
-    bmiHeader.biPlanes = 1;
-
+cast
-    if (useBitfields) bmiHeader.biCompression = OS.BI_BITFIELDS;
-    else bmiHeader.biCompression = OS.BI_RGB;
@@ -1568 +1568 @@
-             */
-            if (i.getByteOrder() == ImageData.LSB_FIRST) {
-
-
-
-
-
-
-
-
-
-
-
-
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
-            } else {
-
-
-
-
-
-
-
-
-
-
-
-
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
+cast
-            }
-        }
-    } else {
-        for (int j = 0; j < rgbs.length; j++) {
-
-
-
+cast
+cast
+cast
-            bmi[offset + 3] = 0;
-            offset += 4;
@@ -1928 +1928 @@
-    int numColors = OS.GetDIBColorTable(hdcMem, 0, maxColors, colors);
-    int offset = transparentPixel * 4;
-
-
-
+cast
+cast
+cast
-    if (OS.IsWinCE) DWT.error(DWT.ERROR_NOT_IMPLEMENTED);
-    OS.SetDIBColorTable(hdcMem, 0, numColors, colors);

branches/0.1/src/dwt/graphics/imagedata.d

@@ -223 +223 @@
-            int inc = 0;
-            for (int _bit = 0x10000; (_bit >>= b) != 0;) inc |= _bit;
-
+cast
-        }
-
@@ -602 +602 @@
-        int endIndex = startIndex + getWidth;
-        for (int i = startIndex; i < endIndex; i++) {
-
+cast
-        }
-        return;
@@ -746 +746 @@
-            offset = 3 - (srcX % 4);
-            mask = 3 << (offset * 2);
-
+cast
-            i++;
-            n--;
@@ -768 +768 @@
-        if ((x & 0x1) == 1) {
-            theByte = data[index] & 0xFF;
-
+cast
-            i++;
-            n--;
@@ -782 +782 @@
-        while (n > 1) {
-            theByte = data[index] & 0xFF;
-
+cast
-            i++;
-            n--;
@@ -791 +791 @@
-                srcX = 0;
-            } else {
-
+cast
-                i++;
-                n--;
@@ -806 +806 @@
-        if (n > 0) {
-            theByte = data[index] & 0xFF;
-
+cast
-        }
-        return;
@@ -894 +894 @@
-            offset = 3 - (srcX % 4);
-            mask = 3 << (offset * 2);
-
+cast
-            i++;
-            n--;
@@ -1155 +1155 @@
-
-    if (alphaData == null) alphaData = new byte[width * height];
-
+cast
-}
-
@@ -1215 +1215 @@
-        mask = 1 << (7 - (x & 0x7));
-        if ((pixelValue & 0x1) == 1) {
-
+cast
-        } else {
-
+cast
-        }
-        return;
@@ -1226 +1226 @@
-        int offset = 3 - (x % 4);
-        mask = 0xFF ^ (3 << (offset * 2));
-
+cast
-        return;
-    }
@@ -1232 +1232 @@
-        index = (y * bytesPerLine) + (x >> 1);
-        if ((x & 0x1) == 0) {
-
+cast
-        } else {
-
+cast
-        }
-        return;
@@ -1240 +1240 @@
-    if (depth == 8) {
-        index = (y * bytesPerLine) + x ;
-
+cast
-        return;
-    }
-    if (depth == 16) {
-        index = (y * bytesPerLine) + (x * 2);
-
-
+cast
+cast
-        return;
-    }
-    if (depth == 24) {
-        index = (y * bytesPerLine) + (x * 3);
-
-
-
+cast
+cast
+cast
-        return;
-    }
-    if (depth == 32) {
-        index = (y * bytesPerLine) + (x * 4);
-
-
-
-
+cast
+cast
+cast
+cast
-        return;
-    }
@@ -1305 +1305 @@
-            mask = 1 << (7 - (srcX & 0x7));
-            if ((pixels[i] & 0x1) == 1) {
-
+cast
-            } else {
-
+cast
-            }
-            i++;
@@ -1325 +1325 @@
-    }
-    if (depth == 2) {
-(byte)0xFC, (byte)0xF3, (byte)0xCF, 
+cast(byte)0xFC, cast(byte)0xF3, cast(byte)0xCF, cast
-        index = (y * bytesPerLine) + (x >> 2);
-        int offset = 3 - (x % 4);
-        while (n > 0) {
-            theByte = pixels[i] & 0x3;
-
+cast
-            i++;
-            n--;
@@ -1356 +1356 @@
-            theByte = pixels[i] & 0x0F;
-            if (high) {
-
+cast
-            } else {
-
+cast
-            }
-            i++;
@@ -1378 +1378 @@
-        index = (y * bytesPerLine) + x;
-        for (int j = 0; j < putWidth; j++) {
-
+cast
-            i++;
-            srcX++;
@@ -1432 +1432 @@
-            mask = 1 << (7 - (srcX & 0x7));
-            if ((pixels[i] & 0x1) == 1) {
-
+cast
-            } else {
-
+cast
-            }
-            i++;
@@ -1452 +1452 @@
-    }
-    if (depth == 2) {
-(byte)0xFC, (byte)0xF3, (byte)0xCF, 
+cast(byte)0xFC, cast(byte)0xF3, cast(byte)0xCF, cast
-        index = (y * bytesPerLine) + (x >> 2);
-        int offset = 3 - (x % 4);
-        while (n > 0) {
-            theByte = pixels[i] & 0x3;
-
+cast
-            i++;
-            n--;
@@ -1483 +1483 @@
-            theByte = pixels[i] & 0x0F;
-            if (high) {
-
+cast
-            } else {
-
+cast
-            }
-            i++;
@@ -1505 +1505 @@
-        index = (y * bytesPerLine) + x;
-        for (int j = 0; j < putWidth; j++) {
-
+cast
-            i++;
-            srcX++;
@@ -1523 +1523 @@
-        for (int j = 0; j < putWidth; j++) {
-            pixel = pixels[i];
-
-
+cast
+cast
-            i++;
-            srcX++;
@@ -1541 +1541 @@
-        for (int j = 0; j < putWidth; j++) {
-            pixel = pixels[i];
-
-
-
+cast
+cast
+cast
-            i++;
-            srcX++;
@@ -1560 +1560 @@
-        for (int j = 0; j < putWidth; j++) {