File libwpg-0.1.3-post.patch of Package mingw32-libwpg

Overview Repositories Revisions Requests Users Attributes Meta

File libwpg-0.1.3-post.patch of Package mingw32-libwpg (Revision 80becfd57b4b19594a78c5ddcb7036b7)

Currently displaying revision 80becfd57b4b19594a78c5ddcb7036b7 , Show latest

--- src/lib/WPG1Parser.cpp	24 Jul 2008 15:36:11 -0000	1.33.2.12
+++ src/lib/WPG1Parser.cpp	13 Aug 2008 07:44:19 -0000	1.33.2.13
@@ -784,7 +784,7 @@
 	data.rect.y2 = (double)m_height/1200.0 - (double)y2/72.0;
 	
 	data.clear();
-	while (m_input->tell() <= m_recordEnd)
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
 		data.append((char)readU8());
 	data.mimeType = "application/x-postscript";
 	if (data.size())
@@ -833,7 +833,7 @@
 	m_input->seek(48, WPX_SEEK_CUR);
 	
 	data.clear();
-	while (m_input->tell() <= m_recordEnd)
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
 		data.append((char)readU8());
 	if (data.size())
 		m_painter->drawImageObject(data);
--- src/lib/WPG2Parser.cpp	24 Jul 2008 13:53:04 -0000	1.58.2.15
+++ src/lib/WPG2Parser.cpp	21 Aug 2008 08:57:04 -0000	1.58.2.17
@@ -899,22 +899,25 @@
 		std::vector<double> positions;
 		WPG_DEBUG_MSG(("  Gradient colors : %d\n", count));
 
-		for(unsigned i = 0; i < count; i++)
+		if (count > 0) // try not to run into signedness/unsignedness issues in second for cycle
 		{
-			unsigned char red = readU8();
-			unsigned char green = readU8();
-			unsigned char blue = readU8();
-			unsigned char alpha = readU8();
-			libwpg::WPGColor color(red, green, blue, alpha);
-			colors.push_back(color);
-			WPG_DEBUG_MSG(("   Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha));
-		}
+			for(unsigned i = 0; i < count; i++)
+			{
+				unsigned char red = readU8();
+				unsigned char green = readU8();
+				unsigned char blue = readU8();
+				unsigned char alpha = readU8();
+				libwpg::WPGColor color(red, green, blue, alpha);
+				colors.push_back(color);
+				WPG_DEBUG_MSG(("   Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha));
+			}
 
-		for(unsigned j = 0; j < count-1; j++)
-		{
-			unsigned pos = readU16();
-			positions.push_back(TO_DOUBLE(pos));
-			WPG_DEBUG_MSG(("   Position #%d : %d\n", j+1, pos));
+			for(unsigned j = 0; j < count-1; j++)
+			{
+				unsigned pos = readU16();
+				positions.push_back(TO_DOUBLE(pos));
+				WPG_DEBUG_MSG(("   Position #%d : %d\n", j+1, pos));
+			}
 		}
 
 		// looks like Corel Presentations only create 2 colors gradient
@@ -1461,7 +1464,7 @@
 
 	// plain data, uncompression
 	if(compression_format==0)
-		for(unsigned ii=0; ii < tmpBufferSize && m_input->tell() <= m_recordEnd; ii++)
+		for(unsigned ii=0; ii < tmpBufferSize && !m_input->atEOS() && m_input->tell() <= m_recordEnd; ii++)
 			buffer.push_back( readU8() );
 	// run-length encoding
 	else if(compression_format==1)
@@ -1869,7 +1872,7 @@
 	
 	WPG_DEBUG_MSG(("Image Object Mime Type : %s\n", binaryData.mimeType.cstr()));
 
-	while (m_input->tell() <= m_recordEnd)
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
 		binaryData.append((char)readU8());
 	WPG_DEBUG_MSG(("     Image Object Size : %li\n", (unsigned long)binaryData.size()));
 
--- src/lib/WPGBinaryData.cpp	16 Nov 2007 20:20:04 -0000	1.2.2.1
+++ src/lib/WPGBinaryData.cpp	15 Aug 2008 12:16:29 -0000	1.2.2.2
@@ -66,16 +66,16 @@
 void libwpg::WPGBinaryData::append(const WPGBinaryData &data)
 {
 	size_t previousSize = m_binaryDataImpl->m_buf.size();
-	m_binaryDataImpl->m_buf.resize(previousSize + data.m_binaryDataImpl->m_buf.size());
-	for (size_t i = previousSize; i < previousSize + data.m_binaryDataImpl->m_buf.size(); i++)
-		m_binaryDataImpl->m_buf[previousSize + i] = data.m_binaryDataImpl->m_buf[i];
+	m_binaryDataImpl->m_buf.reserve(previousSize + data.m_binaryDataImpl->m_buf.size());
+	for (size_t i = 0; i < data.m_binaryDataImpl->m_buf.size(); i++)
+		m_binaryDataImpl->m_buf.push_back(data.m_binaryDataImpl->m_buf[i]);
 }
 
 void libwpg::WPGBinaryData::append(const char *buffer, const size_t bufferSize )
 {
 	size_t previousSize = m_binaryDataImpl->m_buf.size();
-	m_binaryDataImpl->m_buf.resize(previousSize + bufferSize);
-	for (size_t i = previousSize; i < previousSize + bufferSize; i++)
+	m_binaryDataImpl->m_buf.reserve(previousSize + bufferSize);
+	for (size_t i = 0; i < bufferSize; i++)
 		m_binaryDataImpl->m_buf[previousSize + i] = buffer[i];
 }

Places

File libwpg-0.1.3-post.patch of Package mingw32-libwpg (Revision 80becfd57b4b19594a78c5ddcb7036b7)

Places