PatchSet 6907
Date: 2005/09/16 14:44:48
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Warning fixes for kaffe-qt-awt on x86_64-linux
Members:
ChangeLog:1.4428->1.4429
libraries/clib/awt/qt/fnt.cc:1.7->1.8
libraries/clib/awt/qt/toolkit.h:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4428 kaffe/ChangeLog:1.4429
--- kaffe/ChangeLog:1.4428 Fri Sep 16 03:50:31 2005
+++ kaffe/ChangeLog Fri Sep 16 14:44:48 2005
@@ -1,3 +1,9 @@
+2005-09-16 David Walluck <[EMAIL PROTECTED]>
+
+ * libraries/clib/awt/qt/toolkit.h,
+ libraries/clib/awt/qt/fnt.cc:
+ Fixed loss of precision warnings on x86_64-linux.
+
2005-09-16 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: (--with-classpath-gtk-awt): Check for pango
Index: kaffe/libraries/clib/awt/qt/fnt.cc
diff -u kaffe/libraries/clib/awt/qt/fnt.cc:1.7
kaffe/libraries/clib/awt/qt/fnt.cc:1.8
--- kaffe/libraries/clib/awt/qt/fnt.cc:1.7 Wed Sep 14 20:47:59 2005
+++ kaffe/libraries/clib/awt/qt/fnt.cc Fri Sep 16 14:44:49 2005
@@ -187,7 +187,7 @@
if ( off + len > n )
len = n - off;
QByteArray a;
- a.setRawData((const char*)((int)jb + off), len);
+ a.setRawData((const char*)((long)jb + off), len);
w = fm.width(QString(a),len);
env->ReleaseByteArrayElements( jBytes, jb, JNI_ABORT);
DBG(AWT_FNT, qqDebug("fntBytesWidth %s %d\n",jb + off, w));
Index: kaffe/libraries/clib/awt/qt/toolkit.h
diff -u kaffe/libraries/clib/awt/qt/toolkit.h:1.6
kaffe/libraries/clib/awt/qt/toolkit.h:1.7
--- kaffe/libraries/clib/awt/qt/toolkit.h:1.6 Fri Apr 29 13:01:46 2005
+++ kaffe/libraries/clib/awt/qt/toolkit.h Fri Sep 16 14:44:49 2005
@@ -563,7 +563,7 @@
*/
for ( i = (unsigned long)wnd, n=0; n < X->nWindows; i++, n++ ) {
i %= X->nWindows;
- if ( (int)(X->windows[i].w) <= 0 ) {
+ if ( (long)(X->windows[i].w) <= 0 ) {
X->srcIdx = i;
X->lastWindow = wnd;
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
