*** empty log message ***

5 files changed, 56 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index a6d31038a4..88651ffda9 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -825,6 +825,9 @@ OS_CGContextFillRect_1=cast=(CGRect *),flags=struct
 OS_CGContextFlush=
 OS_CGContextFlush_0=cast=(CGContextRef)
 
+OS_CGContextGetInterpolationQuality=
+OS_CGContextGetInterpolationQuality_0=cast=(CGContextRef)
+
 OS_CGContextGetTextPosition=flags=no_gen
 OS_CGContextGetTextPosition_0=cast=(CGContextRef)
 OS_CGContextGetTextPosition_1=cast=(CGPoint)
@@ -874,6 +877,10 @@ OS_CGContextSetFontSize=
 OS_CGContextSetFontSize_0=cast=(CGContextRef)
 OS_CGContextSetFontSize_1=cast=(float)
 
+OS_CGContextSetInterpolationQuality=
+OS_CGContextSetInterpolationQuality_0=cast=(CGContextRef)
+OS_CGContextSetInterpolationQuality_1=
+
 OS_CGContextSetLineCap=
 OS_CGContextSetLineCap_0=cast=(CGContextRef)
 OS_CGContextSetLineCap_1=
@@ -906,6 +913,10 @@ OS_CGContextSetRGBStrokeColor_2=cast=(float)
 OS_CGContextSetRGBStrokeColor_3=cast=(float)
 OS_CGContextSetRGBStrokeColor_4=cast=(float)
 
+OS_CGContextSetRenderingIntent=
+OS_CGContextSetRenderingIntent_0=cast=(CGContextRef)
+OS_CGContextSetRenderingIntent_1=
+
 OS_CGContextSetShouldAntialias=
 OS_CGContextSetShouldAntialias_0=cast=(CGContextRef)
 OS_CGContextSetShouldAntialias_1=
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index ff96462cdb..5f8e4d4a27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -1271,6 +1271,18 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextFlush)
 }
 #endif
 
+#ifndef NO_CGContextGetInterpolationQuality
+JNIEXPORT jint JNICALL OS_NATIVE(CGContextGetInterpolationQuality)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, CGContextGetInterpolationQuality_FUNC);
+	rc = (jint)CGContextGetInterpolationQuality((CGContextRef)arg0);
+	OS_NATIVE_EXIT(env, that, CGContextGetInterpolationQuality_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_CGContextMoveToPoint
 JNIEXPORT void JNICALL OS_NATIVE(CGContextMoveToPoint)
 	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2)
@@ -1389,6 +1401,16 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFontSize)
 }
 #endif
 
+#ifndef NO_CGContextSetInterpolationQuality
+JNIEXPORT void JNICALL OS_NATIVE(CGContextSetInterpolationQuality)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, CGContextSetInterpolationQuality_FUNC);
+	CGContextSetInterpolationQuality((CGContextRef)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, CGContextSetInterpolationQuality_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextSetLineCap
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineCap)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -1453,6 +1475,16 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetRGBStrokeColor)
 }
 #endif
 
+#ifndef NO_CGContextSetRenderingIntent
+JNIEXPORT void JNICALL OS_NATIVE(CGContextSetRenderingIntent)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, CGContextSetRenderingIntent_FUNC);
+	CGContextSetRenderingIntent((CGContextRef)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, CGContextSetRenderingIntent_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextSetShouldAntialias
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetShouldAntialias)
 	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
index 977d05741a..910ecfec62 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 793;
-int OS_nativeFunctionCallCount[793];
+int OS_nativeFunctionCount = 796;
+int OS_nativeFunctionCallCount[796];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems",
 	"AEGetNthPtr",
@@ -109,6 +109,7 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextFillPath",
 	"CGContextFillRect",
 	"CGContextFlush",
+	"CGContextGetInterpolationQuality",
 	"CGContextGetTextPosition",
 	"CGContextMoveToPoint",
 	"CGContextRelease",
@@ -121,12 +122,14 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextSetFillColorSpace",
 	"CGContextSetFont",
 	"CGContextSetFontSize",
+	"CGContextSetInterpolationQuality",
 	"CGContextSetLineCap",
 	"CGContextSetLineDash",
 	"CGContextSetLineJoin",
 	"CGContextSetLineWidth",
 	"CGContextSetRGBFillColor",
 	"CGContextSetRGBStrokeColor",
+	"CGContextSetRenderingIntent",
 	"CGContextSetShouldAntialias",
 	"CGContextSetShouldSmoothFonts",
 	"CGContextSetStrokeColor",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
index ccbd113d1e..4007e236fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
@@ -113,6 +113,7 @@ typedef enum {
 	CGContextFillPath_FUNC,
 	CGContextFillRect_FUNC,
 	CGContextFlush_FUNC,
+	CGContextGetInterpolationQuality_FUNC,
 	CGContextGetTextPosition_FUNC,
 	CGContextMoveToPoint_FUNC,
 	CGContextRelease_FUNC,
@@ -125,12 +126,14 @@ typedef enum {
 	CGContextSetFillColorSpace_FUNC,
 	CGContextSetFont_FUNC,
 	CGContextSetFontSize_FUNC,
+	CGContextSetInterpolationQuality_FUNC,
 	CGContextSetLineCap_FUNC,
 	CGContextSetLineDash_FUNC,
 	CGContextSetLineJoin_FUNC,
 	CGContextSetLineWidth_FUNC,
 	CGContextSetRGBFillColor_FUNC,
 	CGContextSetRGBStrokeColor_FUNC,
+	CGContextSetRenderingIntent_FUNC,
 	CGContextSetShouldAntialias_FUNC,
 	CGContextSetShouldSmoothFonts_FUNC,
 	CGContextSetStrokeColor_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 09c439e133..dd55143f03 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -82,6 +82,8 @@ public class OS extends Platform {
 	public static final int kATSURightToLeftBaseDirection = 1;
 	public static final int kATSUQDBoldfaceTag = 256;
 	public static final int kATSUQDItalicTag = 257;
+	public static final int kATSUQDUnderlineTag = 258;
+	public static final int kATSUStyleStrikeThroughTag = 292;
 	public static final int kATSULeftTab = 0;
 	public static final int kATSUseDeviceOrigins = 1;
 	public static final int kATSUSizeTag = 262;
@@ -787,6 +789,7 @@ public static final native void CGContextFillPath (int ctx);
 public static final native void CGContextStrokeRect (int ctx, CGRect rect);
 public static final native void CGContextFillRect (int ctx, CGRect rect);
 public static final native void CGContextFlush (int ctx);
+public static final native int CGContextGetInterpolationQuality (int context	);
 public static final native void CGContextGetTextPosition (int ctx, CGPoint point);
 public static final native void CGContextMoveToPoint (int ctx, float x, float y);
 public static final native void CGContextRelease(int ctx);
@@ -798,6 +801,7 @@ public static final native void CGContextSetAlpha (int context, float alpha);
 public static final native void CGContextSetFillColor (int ctx, float[] value);
 public static final native void CGContextSetFont (int ctx, int font);
 public static final native void CGContextSetFontSize (int ctx, float size);
+public static final native void CGContextSetInterpolationQuality (int context, int quality);
 public static final native void CGContextSetLineCap (int context, int cap); 
 public static final native void CGContextSetLineDash (int ctx, float phase, float[] lengths, int count);
 public static final native void CGContextSetLineJoin (int context, int join); 
@@ -806,6 +810,7 @@ public static final native void CGContextSetShouldAntialias (int ctx, boolean sh
 public static final native void CGContextSetShouldSmoothFonts (int ctx, boolean shouldSmooth);
 public static final native void CGContextSetStrokeColorSpace (int ctx, int colorspace);
 public static final native void CGContextSetStrokeColor (int ctx, float[] value);
+public static final native void CGContextSetRenderingIntent (int context, int intent);
 public static final native void CGContextSetRGBFillColor (int ctx, float r, float g, float b, float alpha);
 public static final native void CGContextSetRGBStrokeColor (int ctx, float r, float g, float b, float alpha);
 public static final native void CGContextSetTextDrawingMode (int ctx, int mode);