Update of /cvsroot/libwpg/libwpg/src/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26513/src/lib
Modified Files:
WPG1Parser.cpp
Log Message:
Small cleanup
Index: WPG1Parser.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG1Parser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- WPG1Parser.cpp 24 May 2006 22:25:57 -0000 1.7
+++ WPG1Parser.cpp 24 May 2006 22:33:06 -0000 1.8
@@ -60,17 +60,16 @@
WPG_DEBUG_MSG(("Fill attributes: type=%d, length=%d\n", record.GetType(), record.GetLength()));
m_fillStyle = readU8(m_input);
m_fillColorIndex = readU8(m_input);
- WPG_DEBUG_MSG(("Fill attributes: fillStyle=0x%.2x, fillColorIndex=0x%.2x\n", m_fillStyle, m_fillColorIndex));
+ WPG_DEBUG_MSG(("Fill attributes: fillStyle=0x%.2x, fillColorIndex=0x%.2x\n", m_fillStyle, m_fillColorIndex));
break;
case 0x02: // Line attributes
WPG_DEBUG_MSG(("Line attributes: type=%d, length=%d\n", record.GetType(), record.GetLength()));
m_lineStyle = readU8(m_input);
m_lineColorIndex = readU8(m_input);
-// m_lineWidth = (float)((double)readU16(m_input)/(double)1200);
-// m_lineWidth = (float)readU16(m_input)/72;
- tmpLineWidth = readU16(m_input);
- m_lineWidth = (float)((double)tmpLineWidth/(double)1200);
- WPG_DEBUG_MSG(("Line attributes: lineStyle=0x%.2x, lineColorIndex=0x%.2x, lineWidth=%i\n", m_lineStyle, m_lineColorIndex, tmpLineWidth));
+ tmpLineWidth = readU16(m_input);
+ m_lineWidth = (float)((double)tmpLineWidth/(double)1200);
+ WPG_DEBUG_MSG(("Line attributes: lineStyle=0x%.2x, lineColorIndex=0x%.2x, lineWidth=%i\n",
+ m_lineStyle, m_lineColorIndex, tmpLineWidth));
break;
case 0x05: // Line
WPG_DEBUG_MSG(("Line: type=%d, length=%d\n", record.GetType(), record.GetLength()));
@@ -100,7 +99,7 @@
m_height = (float)((double)readU16(m_input)/(double)1200);
WPG_DEBUG_MSG(("Line: x=%.4fin, y=%.4fin, width=%,4fin, height=%.4fin\n", m_startX, m_startY, m_width, m_height));
m_listener->Rectangle(m_startX, m_startY, m_width, m_height, m_lineWidth, m_lineStyle, m_colorPalette[m_lineColorIndex],
- m_fillStyle, m_colorPalette[m_fillColorIndex]);
+ m_fillStyle, m_colorPalette[m_fillColorIndex]);
break;
case 0x08: // Polygon
WPG_DEBUG_MSG(("Polygon: type=%d, length=%d\n", record.GetType(), record.GetLength()));
@@ -111,7 +110,8 @@
tmpPts.push_back(tmpPoint);
}
m_points = tmpPts;
- m_listener->Polygon(m_points, m_lineWidth, m_lineStyle, m_colorPalette[m_lineColorIndex], m_fillStyle, m_colorPalette[m_fillColorIndex]);
+ m_listener->Polygon(m_points, m_lineWidth, m_lineStyle, m_colorPalette[m_lineColorIndex], m_fillStyle,
+ m_colorPalette[m_fillColorIndex]);
break;
case 0x09: // Ellipse
WPG_DEBUG_MSG(("Ellipse: type=%d, length=%d\n", record.GetType(), record.GetLength()));
@@ -123,7 +123,7 @@
WPG_DEBUG_MSG(("Ellipse: cx=%.4fin, cy=%.4fin, rx=%.fin, ry=%.4fin, rotate(%d)\n",
m_centerX, m_centerY, m_radiusX, m_radiusY, m_rotationAngle));
m_listener->Ellipse(m_centerX, m_centerY, m_radiusX, m_radiusY, m_rotationAngle, m_lineWidth,
- m_lineStyle, m_colorPalette[m_lineColorIndex], m_fillStyle, m_colorPalette[m_fillColorIndex]);
+ m_lineStyle, m_colorPalette[m_lineColorIndex], m_fillStyle, m_colorPalette[m_fillColorIndex]);
break;
case 0x0E: // Color map
WPG_DEBUG_MSG(("Color map: type=%d, length=%d\n", record.GetType(), record.GetLength()));
|
