Changeset 213:36f5cb12e1a2 for dwt/graphics/ImageData.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/ImageData.d (modified) (2 diffs)

dwt/graphics/ImageData.d

@@ -291 +291 @@
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the width or height is negative, or if the depth is not
-
+, or the data array is too small to contain the image data
- *    <li>ERROR_NULL_ARGUMENT - if the palette or data is null</li>
- *    <li>ERROR_CANNOT_BE_ZERO - if the scanlinePad is zero</li>
@@ -446 +446 @@
-    int bytesPerLine = (((width * depth + 7) / 8) + (scanlinePad - 1))
-        / scanlinePad * scanlinePad;
+    
+    /*
+     * When the image is being loaded from a PNG, we need to use the theoretical minimum
+     * number of bytes per line to check whether there is enough data, because the actual
+     * number of bytes per line is calculated based on the given depth, which may be larger
+     * than the actual depth of the PNG.
+     */
+    int minBytesPerLine = type is DWT.IMAGE_PNG ? ((((width + 7) / 8) + 3) / 4) * 4 : bytesPerLine;
+    if (data !is null && data.length < minBytesPerLine * height) {
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+    }
-    setAllFields(
-        width,