[Pkg-kde-commits] rev 1054 - trunk/packages/kdelibs/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-07 16:53:19 +0000 (Sat, 07 May 2005)
New Revision: 1054

Modified:
   trunk/packages/kdelibs/debian/patches/23_kimgio_fix.diff
Log:
Er, this time we'll do it right. Really.


Modified: trunk/packages/kdelibs/debian/patches/23_kimgio_fix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_kimgio_fix.diff	2005-05-07 15:52:42 UTC (rev 1053)
+++ trunk/packages/kdelibs/debian/patches/23_kimgio_fix.diff	2005-05-07 16:53:19 UTC (rev 1054)
@@ -1,17 +1,12 @@
---- kdelibs.orig/kimgio/rgb.cpp
-+++ kdelibs.patched/kimgio/rgb.cpp
-@@ -269,14 +269,6 @@
- 
- 	m_data = m_dev->readAll();
- 
--	// sanity ckeck
--	if (m_rle)
--		for (uint o = 0; o < m_numrows; o++)
+--- kde.orig/kimgio/rgb.cpp
++++ kde.patched/kimgio/rgb.cpp
+@@ -272,7 +272,8 @@ bool SGIImage::readImage(QImage& img)
+ 	// sanity ckeck
+ 	if (m_rle)
+ 		for (uint o = 0; o < m_numrows; o++)
 -			if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) {
--				kdDebug(399) << "image corrupt (sanity check failed)" << endl;
--				return false;
--			}
--
- 	if (!readData(img)) {
- 		kdDebug(399) << "image corrupt (incomplete scanline)" << endl;
- 		return false;
++			// do not convert to >=
++			if (m_starttab[o] + m_lengthtab[o] > m_data.size()) {
+ 				kdDebug(399) << "image corrupt (sanity check failed)" << endl;
+ 				return false;
+ 			}