rev 8940 - in branches/kde4/packages/kdelibs/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-01-12 23:41:54 +0000 (Sat, 12 Jan 2008)
New Revision: 8940

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff
Log:
Better patch. Avoid conversion to float.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-12 21:43:33 UTC (rev 8939)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-12 23:41:54 UTC (rev 8940)
@@ -1,3 +1,9 @@
+kde4libs (4:4.0.0-2) UNRELEASED; urgency=low
+
+  * Update arm patch. Avoid conversion to float. Thanks to Pino Toscano.
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 13 Jan 2008 00:39:59 +0100
+
 kde4libs (4:4.0.0-1) experimental; urgency=low
 
   * New upstream release. KDE 4.0.0 yay!

Modified: branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff	2008-01-12 21:43:33 UTC (rev 8939)
+++ branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff	2008-01-12 23:41:54 UTC (rev 8940)
@@ -5,7 +5,7 @@
      const CanvasPatternImpl *pattern = static_cast<const CanvasPatternImpl*>(style);
  
 -    float penWidth = qMax(p->pen().widthF(), 1.0);
-+    float penWidth = qMax(p->pen().widthF(), qreal(1.0));
++    qreal penWidth = qMax<qreal>(p->pen().widthF(), 1.0);
      const QRectF rect = path.controlPointRect().adjusted(-penWidth, -penWidth, penWidth, penWidth);
  
      return pattern->clipForRepeat(p->brushOrigin(), rect);