Changeset 213:36f5cb12e1a2 for dwt/graphics/Image.d

Timestamp:

05/17/08 11:34:28 (8 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Update to SWT 3.4M7

Files:

• dwt/graphics/Image.d (modified) (29 diffs)

dwt/graphics/Image.d

@@ -89 +89 @@
-public final class Image : Resource, Drawable {
-
+    alias Resource.init_ init_;
+
-    /**
-     * specifies whether the receiver is a bitmap or an icon
@@ -157 +159 @@
- * Prevents uninitialized instances from being created outside the package.
- */
-
+
+
-}
-
@@ -191 +194 @@
- */
-public this(Device device, int width, int height) {
-
-
-
-
+
+
+
-}
-
@@ -229 +231 @@
- */
-public this(Device device, Image srcImage, int flag) {
-
-
-
+
+
-    if (srcImage is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (srcImage.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    Rectangle rect = srcImage.getBounds();
+    this.type = srcImage.type;
-    switch (flag) {
-        case DWT.IMAGE_COPY: {
-            this.type = srcImage.type;
-            switch (type) {
-                case DWT.BITMAP:
@@ -270 +271 @@
-                case DWT.ICON:
-                    static if (OS.IsWinCE) {
-device, 
+
-                    } else {
-                        handle = OS.CopyImage(srcImage.handle, OS.IMAGE_ICON, rect.width, rect.height, 0);
@@ -279 +280 @@
-                    DWT.error(DWT.ERROR_INVALID_IMAGE);
-            }
-
-
+
-        }
-        case DWT.IMAGE_DISABLE: {
@@ -338 +338 @@
-                }
-            }
-
-
-
+
+
-        }
-        case DWT.IMAGE_GRAY: {
@@ -403 +402 @@
-                }
-            }
-
-
-
+
+
-        }
-        default:
-            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    }
+    init_();
-}
-
@@ -443 +442 @@
- */
-public this(Device device, Rectangle bounds) {
-
-
+
-    if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-device, 
-f (device.tracking) device.new_Object(this
+
+nit_(
-}
-
@@ -469 +467 @@
- */
-public this(Device device, ImageData data) {
-
-
-
-
+
+
+
-}
-
@@ -501 +498 @@
- */
-public this(Device device, ImageData source, ImageData mask) {
-
-
+
-    if (source is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (mask is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
@@ -509 +505 @@
-    }
-    mask = ImageData.convertMask(mask);
-
-f (device.tracking) device.new_Object(this
+this.
+nit_(
-}
-
@@ -562 +558 @@
- */
-public this (Device device, InputStream stream) {
-
-
-
-
+
+
+
-}
-
@@ -596 +591 @@
- */
-public this (Device device, String filename) {
-if (device is null) device = Device.getDevice(
-if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT)
+super(device
+device = this.device
-    if (filename is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-this.device = devic
+bool gdip = tru
-    try {
-        device.checkGDIP();
+    } catch (DWTException e) {
+        gdip = false;
+    }
+    /*
+    * Bug in GDI+.  For some reason, Bitmap.LockBits() segment faults
+    * when loading GIF files in 64-bit Windows.  The fix is to not use
+    * GDI+ image loading in this case.
+    */
+    if (gdip && (void*).sizeof is 8 && filename.toLowerCase().endsWith(".gif")) gdip = false;
+    if (gdip) {
-        int length = filename.length;
-        char[] chars = new char[length+1];
@@ -742 +747 @@
-                                img.transparentPixel = transparentPixel;
-                                img.alphaData = alphaData;
-device, 
+
-                            }
-                        }
@@ -754 +759 @@
-            }
-        }
- catch (DWTException e) {}
-device, 
-f(device.tracking) device.new_Object(this
+
+
+nit_(
-}
-
@@ -854 +859 @@
-        }
-    }
-int
+void*
-    HBITMAP hDib = OS.CreateDIBSection(null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, &pBits, null, 0);
-    if (hDib is null) DWT.error(DWT.ERROR_NO_HANDLES);
@@ -878 +883 @@
-// function has them stored in the int array.
-
-
+ /*long*/ 
-    switch (type) {
-        case DWT.BITMAP: {
@@ -997 +1002 @@
-            Gdip.Bitmap img;
-            ubyte* pixels;
-
+
+
+
+
+
+
+
+
-                auto hDC = device.internal_new_GC(null);
-                auto srcHdc = OS.CreateCompatibleDC(hDC);
@@ -1014 +1026 @@
-                OS.DeleteObject(memDib);
-                OS.SelectObject(srcHdc, iconInfo.hbmMask);
-0
+3
-                    for (int x = 0; x < imgWidth; ++x) {
-
-
-
-
+
+
+
+
+
+
-                        }
-                        dp += 4;
@@ -1044 +1058 @@
-}
-
-
-
-
-
-
-
-
-
+
-    if (memGC !is null) memGC.dispose();
-    if (type is DWT.ICON) {
@@ -1061 +1068 @@
-    handle = null;
-    memGC = null;
-    if (device.tracking) device.dispose_Object(this);
-    device = null;
-}
-
@@ -1580 +1585 @@
-}
-
-Device device, 
+
-    if (width <= 0 || height <= 0) {
-        DWT.error (DWT.ERROR_INVALID_ARGUMENT);
-    }
-    this.device = device;
-    type = DWT.BITMAP;
-    auto hDC = device.internal_new_GC(null);
@@ -1645 +1649 @@
-    }
-
-int[1]
-pBits.ptr
+void*
+&pBits
-}
-
@@ -1667 +1671 @@
-
-static int[] init_(Device device, Image image, ImageData i) {
-    if (image !is null) image.device = device;
-
-    /*
@@ -1834 +1837 @@
-    OS.MoveMemory(pBits, data.ptr, data.length);
-
-
+ /*long*/ 
-    if (i.getTransparencyType() is DWT.TRANSPARENCY_MASK) {
-        /* Get the HDC for the device */
@@ -1970 +1973 @@
-    return init_(device, image, imageData);
-}
-Device device, 
+
-    if (i is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    init_(device, this, i);
@@ -2014 +2017 @@
-        data.device = device;
-        data.image = this;
-hF
+f
-    }
-    return imageDC;
@@ -2145 +2148 @@
- */
-public static Image win32_new(Device device, int type, HGDIOBJ handle) {
-
-
+
-    image.type = type;
-    image.handle = handle;
-    image.device = device;
-    return image;
-}