File qt-4.6.0-fix-gui-precision-loss.patch of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.6.0-fix-gui-precision-loss.patch of Package mingw32-libqt4 (Revision 60da7b5734b5c2acebacc61b8f66de3f)

Currently displaying revision 60da7b5734b5c2acebacc61b8f66de3f , Show latest

--- src/gui/kernel/qkeymapper_win.cpp	2009-12-18 11:06:14.000000000 +0100
+++ src/gui/kernel/qkeymapper_win.cpp	2009-12-18 11:07:56.000000000 +0100
@@ -619,7 +619,7 @@
     /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout()
      * returns a DWORD. */
 
-    LCID newLCID = MAKELCID((DWORD)GetKeyboardLayout(0), SORT_DEFAULT);
+    LCID newLCID = MAKELCID((DWORD_PTR)GetKeyboardLayout(0), SORT_DEFAULT);
 //    keyboardInputLocale = qt_localeFromLCID(newLCID);
 
     bool bidi = false;
--- src/gui/painting/qdrawhelper_p.h	2009-12-18 11:06:14.000000000 +0100
+++ src/gui/painting/qdrawhelper_p.h	2009-12-18 11:06:49.000000000 +0100
@@ -1646,7 +1646,7 @@
         return;
     }
 
-    const int align = (long(dest) & 3);
+    const int align = (qptrdiff(dest) & 3);
     switch (align) {
     case 1: *dest++ = qrgb666(*src++); --count;
     case 2: *dest++ = qrgb666(*src++); --count;
--- src/gui/text/qfontengine_win.cpp	2009-12-18 11:06:14.000000000 +0100
+++ src/gui/text/qfontengine_win.cpp	2009-12-18 11:10:49.000000000 +0100
@@ -208,7 +208,7 @@
         unitsPerEm = otm->otmEMSquare;
         x_height = (int)otm->otmsXHeight;
         loadKerningPairs(designToDevice);
-        _faceId.filename = QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpFullName)).toLatin1();
+        _faceId.filename = QString::fromWCharArray((wchar_t *)((char *)otm + (qptrdiff)otm->otmpFullName)).toLatin1();
         lineWidth = otm->otmsUnderscoreSize;
         fsType = otm->otmfsType;
         free(otm);
@@ -987,8 +987,8 @@
     Properties p;
     p.emSquare = unitsPerEm;
     p.italicAngle = otm->otmItalicAngle;
-    p.postscriptName = QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpFamilyName)).toLatin1();
-    p.postscriptName += QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpStyleName)).toLatin1();
+    p.postscriptName = QString::fromWCharArray((wchar_t *)((char *)otm + (qptrdiff)otm->otmpFamilyName)).toLatin1();
+    p.postscriptName += QString::fromWCharArray((wchar_t *)((char *)otm + (qptrdiff)otm->otmpStyleName)).toLatin1();
 #ifndef QT_NO_PRINTER
     p.postscriptName = QPdf::stripSpecialCharacters(p.postscriptName);
 #endif

Places

File qt-4.6.0-fix-gui-precision-loss.patch of Package mingw32-libqt4 (Revision 60da7b5734b5c2acebacc61b8f66de3f)

Places