diff options
| author | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2011-10-04 17:17:01 -0400 |
|---|---|---|
| committer | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2011-10-04 17:17:48 -0400 |
| commit | 07bbcf11868d01025ec708e21da08af7b897caa1 (patch) | |
| tree | b307c68673dbe959bfffef8ca9bf353ecf7fdfd9 /bundles/org.eclipse.swt | |
| parent | 179b4e970a9571ac7544234fe0a18ddb0646c45f (diff) | |
| download | eclipse.platform.swt-07bbcf11868d01025ec708e21da08af7b897caa1.tar.gz eclipse.platform.swt-07bbcf11868d01025ec708e21da08af7b897caa1.tar.xz eclipse.platform.swt-07bbcf11868d01025ec708e21da08af7b897caa1.zip | |
Bug 350783 - certain images cause "no more handles" on win7
Diffstat (limited to 'bundles/org.eclipse.swt')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java | 3 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java index 5b7b44b10b..d413e38bac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java @@ -104,7 +104,8 @@ public class Gdip extends Platform { public static final int PixelFormat48bppRGB = (12 | (48 << 8) | PixelFormatExtended); public static final int PixelFormat64bppARGB = (13 | (64 << 8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended); public static final int PixelFormat64bppPARGB = (14 | (64 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended); - public static final int PixelFormatMax = 15; + public static final int PixelFormat32bppCMYK = (15 | (32 << 8)); + public static final int PixelFormatMax = 16; public static final int PixelOffsetModeNone = QualityModeHigh + 1; public static final int PixelOffsetModeHalf = QualityModeHigh + 2; public static final int SmoothingModeDefault = QualityModeDefault; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index 9722cb6876..cef405f92f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -625,10 +625,11 @@ void initNative(String filename) { this.handle = createDIB(width, height, 16); break; case Gdip.PixelFormat24bppRGB: + case Gdip.PixelFormat32bppCMYK: this.handle = createDIB(width, height, 24); break; case Gdip.PixelFormat32bppRGB: - // These will loose either precision or transparency + // These will lose either precision or transparency case Gdip.PixelFormat16bppGrayScale: case Gdip.PixelFormat48bppRGB: case Gdip.PixelFormat32bppPARGB: |