Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java45
1 files changed, 24 insertions, 21 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
index e9e2dae796..fb8935c771 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
@@ -44,7 +44,7 @@ public final class Region extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public long /*int*/ handle;
+ public long handle;
/**
* Constructs a new empty region.
@@ -94,9 +94,15 @@ public Region(Device device) {
}
}
-Region(Device device, long /*int*/ handle) {
+Region(Device device, long handle) {
super(device);
this.handle = handle;
+ /*
+ * When created this way, Font doesn't own its .handle, and
+ * for this reason it can't be disposed. Tell leak detector
+ * to just ignore it.
+ */
+ this.ignoreNonDisposed();
}
/**
@@ -115,13 +121,13 @@ Region(Device device, long /*int*/ handle) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Region cocoa_new(Device device, long /*int*/ handle) {
+public static Region cocoa_new(Device device, long handle) {
return new Region(device, handle);
}
-static long /*int*/ polyToRgn(int[] poly, int length) {
+static long polyToRgn(int[] poly, int length) {
short[] r = new short[4];
- long /*int*/ polyRgn = OS.NewRgn(), rectRgn = OS.NewRgn();
+ long polyRgn = OS.NewRgn(), rectRgn = OS.NewRgn();
int minY = poly[1], maxY = poly[1];
for (int y = 3; y < length; y += 2) {
if (poly[y] < minY) minY = poly[y];
@@ -164,11 +170,11 @@ static long /*int*/ polyToRgn(int[] poly, int length) {
return polyRgn;
}
-static long /*int*/ polyRgn(int[] pointArray, int count) {
+static long polyRgn(int[] pointArray, int count) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ polyRgn;
+ long polyRgn;
if (C.PTR_SIZEOF == 4) {
polyRgn = OS.NewRgn();
OS.OpenRgn();
@@ -221,7 +227,7 @@ void add(int[] pointArray, int count) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ polyRgn = polyRgn(pointArray, count);
+ long polyRgn = polyRgn(pointArray, count);
OS.UnionRgn(handle, polyRgn, handle);
OS.DisposeRgn(polyRgn);
} finally {
@@ -280,7 +286,7 @@ public void add(int x, int y, int width, int height) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ rectRgn = OS.NewRgn();
+ long rectRgn = OS.NewRgn();
short[] r = new short[4];
OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
OS.RectRgn(rectRgn, r);
@@ -366,19 +372,17 @@ public boolean contains(Point pt) {
NSAffineTransform transform;
void convertRgn(NSAffineTransform transform) {
- long /*int*/ newRgn = OS.NewRgn();
+ long newRgn = OS.NewRgn();
Callback callback = new Callback(this, "convertRgn", 4);
- long /*int*/ proc = callback.getAddress();
- if (proc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
this.transform = transform;
- OS.QDRegionToRects(handle, OS.kQDParseRegionFromTopLeft, proc, newRgn);
+ OS.QDRegionToRects(handle, OS.kQDParseRegionFromTopLeft, callback.getAddress(), newRgn);
this.transform = null;
callback.dispose();
OS.CopyRgn(newRgn, handle);
OS.DisposeRgn(newRgn);
}
-long /*int*/ convertRgn(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ newRgn) {
+long convertRgn(long message, long rgn, long r, long newRgn) {
if (message == OS.kQDRegionToRectsMsgParse) {
short[] rect = new short[4];
C.memmove(rect, r, rect.length * 2);
@@ -408,7 +412,7 @@ long /*int*/ convertRgn(long /*int*/ message, long /*int*/ rgn, long /*int*/ r,
points[i++] = (short)Math.round(point.y);
points[i++] = startX;
points[i++] = startY;
- long /*int*/ polyRgn = polyRgn(points, points.length);
+ long polyRgn = polyRgn(points, points.length);
OS.UnionRgn(newRgn, polyRgn, newRgn);
OS.DisposeRgn(polyRgn);
}
@@ -469,7 +473,6 @@ public Rectangle getBounds() {
NSBezierPath getPath() {
Callback callback = new Callback(this, "regionToRects", 4);
- if (callback.getAddress() == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
NSBezierPath path = NSBezierPath.bezierPath();
path.retain();
OS.QDRegionToRects(handle, OS.kQDParseRegionFromTopLeft, callback.getAddress(), path.id);
@@ -480,7 +483,7 @@ NSBezierPath getPath() {
NSPoint pt = new NSPoint();
short[] rect = new short[4];
-long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ path) {
+long regionToRects(long message, long rgn, long r, long path) {
if (message == OS.kQDRegionToRectsMsgParse) {
C.memmove(rect, r, rect.length * 2);
pt.x = rect[1];
@@ -510,7 +513,7 @@ long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/
*/
@Override
public int hashCode() {
- return (int)/*64*/handle;
+ return (int)handle;
}
/**
@@ -559,7 +562,7 @@ public void intersect(int x, int y, int width, int height) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ rectRgn = OS.NewRgn();
+ long rectRgn = OS.NewRgn();
short[] r = new short[4];
OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
OS.RectRgn(rectRgn, r);
@@ -711,7 +714,7 @@ public void subtract (int[] pointArray) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ polyRgn = polyRgn(pointArray, pointArray.length);
+ long polyRgn = polyRgn(pointArray, pointArray.length);
OS.DiffRgn(handle, polyRgn, handle);
OS.DisposeRgn(polyRgn);
} finally {
@@ -765,7 +768,7 @@ public void subtract(int x, int y, int width, int height) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- long /*int*/ rectRgn = OS.NewRgn();
+ long rectRgn = OS.NewRgn();
short[] r = new short[4];
OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
OS.RectRgn(rectRgn, r);

Back to the top