File abiword-fixes.patch of Package abiword

Overview Repositories Revisions Requests Users Attributes Meta

File abiword-fixes.patch of Package abiword (Revision 062e01f7d877ccd772e25f4a3cd74fd6)

Currently displaying revision 062e01f7d877ccd772e25f4a3cd74fd6 , Show latest

--- abiword-2.4.5/abi/src/af/xap/unix/xap_UnixPSGraphics.cpp.xx	2006-12-19 10:08:39.000000000 +0100
+++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixPSGraphics.cpp	2006-12-19 10:10:54.000000000 +0100
@@ -1188,6 +1188,7 @@
 	UT_uint16 col = 0;
 	while (cursor < end)
 	{
+		UT_Byte red, green, blue;
 		/*
 		  This is a pretty tight loop, for speed.  We're taking
 		  each sample and averaging the R, G, and B values and
@@ -1206,10 +1207,12 @@
 		// TODO : Balance these colors!  I don't like the output
 		// TODO : I get from a simple average or adding the YIQ
 		// TODO : weights.  Look at Netscape for something better.
-		
-		g_snprintf(reinterpret_cast<char *>(&hexbuf[0]), sizeof(hexbuf), "%.2X", ( static_cast<UT_Byte>( ( static_cast<float>(*cursor++) * static_cast<float>(1) +
-										  static_cast<float>(*cursor++) * static_cast<float>(1) +
-										  static_cast<float>(*cursor++) * static_cast<float>(1) ) /
+		red = *cursor++;
+		green = *cursor++;
+		blue = *cursor++;
+		g_snprintf(reinterpret_cast<char *>(&hexbuf[0]), sizeof(hexbuf), "%.2X", ( static_cast<UT_Byte>( ( static_cast<float>(red) * static_cast<float>(1) +
+										  static_cast<float>(green) * static_cast<float>(1) +
+										  static_cast<float>(blue) * static_cast<float>(1) ) /
 										  static_cast<float>(3.0) )) );
 
 		m_ps->writeBytes(hexbuf, 2);
--- abiword-2.4.5/abi/src/tools/pfa2afm/unix/parsepfa.c.xx	2006-12-19 10:11:54.000000000 +0100
+++ abiword-2.4.5/abi/src/tools/pfa2afm/unix/parsepfa.c	2006-12-19 10:14:03.000000000 +0100
@@ -641,6 +641,7 @@
 
     for ( pt = str, end = str+len-1; pt<end && (ch=getc(file))!=EOF && ch!='\r' && ch!='\n';
 	*pt++ = ch );
+    if (pt < end) {
     if ( ch=='\n' )
 	*pt++ = '\n';
     else if ( ch=='\r' ) {
@@ -648,6 +649,7 @@
 	if ((ch=getc(file))!='\n' )
 	    ungetc(ch,file);
     }
+    }
     if ( pt==str )
 return( NULL );
     *pt = '\0';

Places

File abiword-fixes.patch of Package abiword (Revision 062e01f7d877ccd772e25f4a3cd74fd6)

Places