diff options
| author | Sravan Kumar Lakkimsetti | 2019-08-27 06:44:40 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2019-10-14 09:06:33 +0000 |
| commit | b67d97f3c9f47daebc8c5a79fb2125d8c1bfcb0a (patch) | |
| tree | f141e1bad8fff60cbb93d5582e31d4b38ce51b52 | |
| parent | bd6f208ff041f826ee5058d5247ed021799e34b8 (diff) | |
| download | eclipse.platform.swt-b67d97f3c9f47daebc8c5a79fb2125d8c1bfcb0a.tar.gz eclipse.platform.swt-b67d97f3c9f47daebc8c5a79fb2125d8c1bfcb0a.tar.xz eclipse.platform.swt-b67d97f3c9f47daebc8c5a79fb2125d8c1bfcb0a.zip | |
Bug 548430 - NullPointerException in Image.internal_new_GC (4.12.0RC2)
Change-Id: I90bf1ad5b893b94f2a100760cf28e460ef02ed36
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java index 8c3dafdda2..e726a16d29 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java @@ -2184,7 +2184,7 @@ public long internal_new_GC (GCData data) { int height = 256; NSBitmapImageRep rep = (NSBitmapImageRep) new NSBitmapImageRep().alloc(); rep = rep.initWithBitmapDataPlanes(0, width, height, 8, 3, false, false, OS.NSDeviceRGBColorSpace, - OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, width * 4, 32); + OS.NSAlphaFirstBitmapFormat, width * 4, 32); graphicsContext = NSGraphicsContext.graphicsContextWithBitmapImageRep(rep); rep.release(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java index e7c57f0714..50e461137b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java @@ -3197,7 +3197,7 @@ public long internal_new_GC (GCData data) { int height = 256; NSBitmapImageRep rep = (NSBitmapImageRep) new NSBitmapImageRep().alloc(); rep = rep.initWithBitmapDataPlanes(0, width, height, 8, 3, false, false, OS.NSDeviceRGBColorSpace, - OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, width * 4, 32); + OS.NSAlphaFirstBitmapFormat, width * 4, 32); context = NSGraphicsContext.graphicsContextWithBitmapImageRep(rep); rep.release(); } |