summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.org>2006-07-26 22:12:21 +0000
committerAndreas Tobler <a.tobler@schweiz.org>2006-07-26 22:12:21 +0000
commit23df147bbd9c192ff4aef97581041e1a0a97f421 (patch)
tree5f118d538d3beefe4ba0c11dbacbb67819a2f9f5
parent573c7e46496811586ac0422956846ee61ed160f9 (diff)
downloadclasspath-23df147bbd9c192ff4aef97581041e1a0a97f421.tar.gz
2006-07-27 Andreas Tobler <a.tobler@schweiz.ch>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix): Remove g_assert from unused obj. (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Mark obj as unused and remove g_assert on it.
-rw-r--r--ChangeLog8
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 61871ac81..ec582ed8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-27 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+ (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix): Remove
+ g_assert from unused obj.
+ (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Mark
+ obj as unused and remove g_assert on it.
+
2006-07-26 Roman Kennke <kennke@aicas.com>
* javax/swing/RepaintManager.java
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
index f80ae3838..0670403dd 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
@@ -239,7 +239,6 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
{
jdouble *native_matrix = NULL;
struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
- g_assert (obj != NULL);
g_assert (gr != NULL);
native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);
@@ -275,7 +274,7 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoScale
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
-(JNIEnv *env, jobject obj, jlong pointer,
+(JNIEnv *env, jobject obj __attribute__((unused)), jlong pointer,
jobject font,
jfloat x, jfloat y, jint n,
jintArray java_codes,
@@ -289,7 +288,6 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
float *native_positions;
jint i = 0;
- g_assert (obj != NULL);
g_assert (java_codes != NULL);
g_assert (java_positions != NULL);