fontmatrix (0.6.0+svn20100107-2) debian-changes-0.6.0+svn20100107-2

Description: Upstream changes introduced in version 0.6.0+svn20100107-2
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 fontmatrix (0.6.0+svn20100107-2) unstable; urgency=low
 .
   * debian/patches/fminfodisplay.cpp: Created a new patch to fix FTBFS on
     armel as Michael's patch was incomplete (Closes: #563972).
 .
 The person named in the Author field signed this changelog entry.
Author: Oleksandr Moskalenko <malex@debian.org>
Bug-Debian: http://bugs.debian.org/563972

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- /dev/null
+++ fontmatrix-0.6.0+svn20100107/patches/series
@@ -0,0 +1 @@
+fminfodisplay.cpp
--- /dev/null
+++ fontmatrix-0.6.0+svn20100107/patches/fminfodisplay.cpp
@@ -0,0 +1,22 @@
+Index: fontmatrix-0.6.0+svn20100107/src/fminfodisplay.cpp
+===================================================================
+--- fontmatrix-0.6.0+svn20100107.orig/src/fminfodisplay.cpp	2010-01-09 03:07:33.000000000 -0600
++++ fontmatrix-0.6.0+svn20100107/src/fminfodisplay.cpp	2010-01-09 03:07:45.000000000 -0600
+@@ -137,7 +137,7 @@
+ 	QTransform tf;
+ 	double pifs ( typotek::getInstance()->getPreviewInfoFontSize() );
+ 	double scaleFactor( pifs / font->getUnitPerEm() );
+-	double maxHeight ( 0 );
++	qreal maxHeight ( 0 );
+ 	double vertOffset ( pifs );
+ 	double horOffset ( 0 );
+ 	tf.translate ( horOffset , vertOffset );
+@@ -151,7 +151,7 @@
+ 				GlyphToSVGHelper gtsh ( gpi->path(), tf );
+ 				svg += gtsh.getSVGPath() + "\n";
+ 				horOffset += gpi->data(GLYPH_DATA_HADVANCE).toDouble() * scaleFactor;
+-				maxHeight = qMax ( gtsh.getRect().height(), maxHeight );
++				maxHeight = qMax<qreal> ( gtsh.getRect().height(), maxHeight );
+ 				tf.translate( gpi->data(GLYPH_DATA_HADVANCE).toDouble()  * scaleFactor,0 );
+ 				delete gpi;
+ 			}
--- /dev/null
+++ fontmatrix-0.6.0+svn20100107/patches/01_fminfodisplay.cpp.patch
@@ -0,0 +1,13 @@
+Index: fontmatrix-0.6.0+svn20100107/src/fminfodisplay.cpp
+===================================================================
+--- fontmatrix-0.6.0+svn20100107.orig/src/fminfodisplay.cpp	2009-08-03 05:27:37.000000000 -0500
++++ fontmatrix-0.6.0+svn20100107/src/fminfodisplay.cpp	2010-01-09 03:03:13.000000000 -0600
+@@ -151,7 +151,7 @@
+ 				GlyphToSVGHelper gtsh ( gpi->path(), tf );
+ 				svg += gtsh.getSVGPath() + "\n";
+ 				horOffset += gpi->data(GLYPH_DATA_HADVANCE).toDouble() * scaleFactor;
+-				maxHeight = qMax ( gtsh.getRect().height(), maxHeight );
++				maxHeight = qMax<qreal> ( gtsh.getRect().height(), maxHeight );
+ 				tf.translate( gpi->data(GLYPH_DATA_HADVANCE).toDouble()  * scaleFactor,0 );
+ 				delete gpi;
+ 			}