Menu
▾
▴
[Libwpg-cvs] libwpg/src/lib Makefile.am, 1.31, 1.32 WPG1Parser.cpp, 1.51, 1.52 WPG1Parser.h, 1.19, 1.20 WPG2Parser.cpp, 1.87, 1.88 WPG2Parser.h, 1.30, 1.31 WPGBitmap.cpp, 1.23, 1.24 WPGBitmap.h, 1.10, 1.11 WPGBrush.cpp, 1.4, 1.5 WPGBrush.h, 1.7, 1.8 WPGGradient.cpp, 1.6, 1.7 WPGGradient.h, 1.3, 1.4 WPGPaintInterface.h, 1.15, 1.16 WPGPen.cpp, 1.8, 1.9 WPGPen.h, 1.4, 1.5 WPGSVGGenerator.cpp, 1.21, 1.22 WPGSVGGenerator.h, 1.15, 1.16 WPGXParser.cpp, 1.16, 1.17 WPGXParser.h, 1.15, 1.16 libwpg.h.in, 1.10, 1.11
Update of /cvsroot/libwpg/libwpg/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18191/src/lib Modified Files: Makefile.am WPG1Parser.cpp WPG1Parser.h WPG2Parser.cpp WPG2Parser.h WPGBitmap.cpp WPGBitmap.h WPGBrush.cpp WPGBrush.h WPGGradient.cpp WPGGradient.h WPGPaintInterface.h WPGPen.cpp WPGPen.h WPGSVGGenerator.cpp WPGSVGGenerator.h WPGXParser.cpp WPGXParser.h libwpg.h.in Log Message: removing public visibility of WPGBitmap class since Qt4 is able to load a bitmap from a bmp Index: libwpg.h.in =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/libwpg.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- libwpg.h.in 27 Nov 2008 16:33:00 -0000 1.10 +++ libwpg.h.in 28 Nov 2008 11:53:03 -0000 1.11 @@ -39,6 +39,5 @@ #include "WPGPen.h" #include "WPGBrush.h" #include "WPGGradient.h" -#include "WPGBitmap.h" #endif Index: WPGBrush.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBrush.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- WPGBrush.h 27 Nov 2008 21:42:16 -0000 1.7 +++ WPGBrush.h 28 Nov 2008 11:53:03 -0000 1.8 @@ -54,10 +54,6 @@ WPGBrush(WPGBrushStyle brushStyle); -// explicit WPGBrush(const WPGColor& fore); - -// WPGBrush(const WPGColor& fore, const WPGColor& back); - WPGBrush(const WPGBrush& brush); WPGBrush& operator=(const WPGBrush& brush); Index: WPGGradient.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGGradient.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WPGGradient.cpp 27 Nov 2008 21:42:16 -0000 1.6 +++ WPGGradient.cpp 28 Nov 2008 11:53:03 -0000 1.7 @@ -103,13 +103,6 @@ return d->gradientStops[index].color; } -#if 0 -void libwpg::WPGGradient::clear() -{ - d->gradientStops.clear(); -} -#endif - void libwpg::WPGGradient::addStop(double offset, const libwpg::WPGColor& color) { libwpg::WPGGradientStop stop(offset, color); Index: WPG1Parser.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG1Parser.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- WPG1Parser.cpp 27 Nov 2008 16:33:00 -0000 1.51 +++ WPG1Parser.cpp 28 Nov 2008 11:53:03 -0000 1.52 @@ -665,17 +665,6 @@ } } - - // debugging only - if(buffer && 0) - { - for(unsigned x = 0; x < width; x++) - for(unsigned y = 0; y < height; y++) - { - libwpg::WPGColor color = bitmap.pixel(x,y); - WPG_DEBUG_MSG((" pixel at %d, %d: %3d %3d %3d\n", x, y, color.red, color.green, color.blue)); - } - } } void WPG1Parser::handleBitmapTypeOne() @@ -719,13 +708,14 @@ propList.insert("svg:y", 0.0f); propList.insert("svg:width", (float)((double)width/(double)hres)); propList.insert("svg:height", (float)((double)height/(double)vres)); + propList.insert("libwpg:mime-type", "image/bmp"); std::vector<unsigned char> buffer; decodeRLE(buffer, width, height, depth); if (buffer.size() && buffer.size() == (size_t)((width*depth + 7)/8)*height) { fillPixels(bitmap, &buffer[0], width, height, depth); - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } } @@ -787,13 +777,14 @@ propList.insert("svg:y", (float)((double)(ys1)/1200.0)); propList.insert("svg:width", (float)((double)(xs2-xs1)/1200.0)); propList.insert("svg:height", (float)((double)(ys2-ys1)/1200.0)); + propList.insert("libwpg:mime-type", "image/bmp"); std::vector<unsigned char> buffer; decodeRLE(buffer, width, height, depth); if (buffer.size() && buffer.size() == (size_t)((width*depth + 7)/8)*height) { fillPixels(bitmap, &buffer[0], width, height, depth); - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } } Index: WPGBitmap.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBitmap.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- WPGBitmap.h 27 Nov 2008 16:33:00 -0000 1.10 +++ WPGBitmap.h 28 Nov 2008 11:53:03 -0000 1.11 @@ -36,9 +36,7 @@ class WPGBitmap { public: - WPGBitmap(int width, int height); - - WPGBitmap(int width, int height, bool verticalFlip, bool horizontalFlip); + WPGBitmap(int width, int height, bool verticalFlip=false, bool horizontalFlip=false); WPGBitmap(const WPGBitmap&); @@ -54,8 +52,6 @@ // return height in pixel int height() const; - WPGColor pixel(int x, int y) const; - void setPixel(int x, int y, const WPGColor& color); const ::WPXBinaryData& getDIB() const; Index: WPGXParser.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGXParser.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- WPGXParser.cpp 11 Dec 2007 14:44:32 -0000 1.16 +++ WPGXParser.cpp 28 Nov 2008 11:53:03 -0000 1.17 @@ -66,11 +66,6 @@ return (unsigned long)(p0|(p1<<8)|(p2<<16)|(p3<<24)); } -signed char WPGXParser::readS8() -{ - return (signed char)readU8(); -} - short WPGXParser::readS16() { return (short)readU16(); Index: WPGSVGGenerator.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGSVGGenerator.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- WPGSVGGenerator.h 27 Nov 2008 21:42:16 -0000 1.15 +++ WPGSVGGenerator.h 28 Nov 2008 11:53:03 -0000 1.16 @@ -56,7 +56,6 @@ void drawPolyline(const ::WPXPropertyListVector& vertices); void drawPolygon(const ::WPXPropertyListVector& vertices); void drawPath(const ::WPXPropertyListVector& path); - void drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& bitmap); void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); private: Index: WPG2Parser.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- WPG2Parser.h 27 Nov 2008 21:42:16 -0000 1.30 +++ WPG2Parser.h 28 Nov 2008 11:53:03 -0000 1.31 @@ -31,6 +31,7 @@ #include "WPGXParser.h" #include "WPGBrush.h" #include "WPGPen.h" +#include "WPGBitmap.h" #include <libwpd/libwpd.h> #include <map> Index: WPGBitmap.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBitmap.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- WPGBitmap.cpp 27 Nov 2008 16:33:00 -0000 1.23 +++ WPGBitmap.cpp 28 Nov 2008 11:53:03 -0000 1.24 @@ -70,11 +70,6 @@ Private(int w, int h): width(w), height(h), vFlip(false), hFlip(false), pixels(0), dib() {} }; -libwpg::WPGBitmap::WPGBitmap(int w, int h): d(new Private(w, h)) -{ - d->pixels = new WPGColor[w*h]; -} - libwpg::WPGBitmap::WPGBitmap(int w, int h, bool verticalFlip, bool horizontalFlip) : d(new Private(w, h)) { @@ -124,14 +119,6 @@ return d->height; } -libwpg::WPGColor libwpg::WPGBitmap::pixel(int x, int y) const -{ - if((x < 0) || (y <0) || (x >= d->width) || (y >= d->height)) - return libwpg::WPGColor(); - - return d->pixels[y*d->width + x]; -} - void libwpg::WPGBitmap::setPixel(int x, int y, const libwpg::WPGColor& color) { if((x < 0) || (y <0) || (x >= d->width) || (y >= d->height)) Index: WPG1Parser.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG1Parser.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- WPG1Parser.h 24 Jul 2008 13:52:24 -0000 1.19 +++ WPG1Parser.h 28 Nov 2008 11:53:03 -0000 1.20 @@ -31,6 +31,7 @@ #include "WPGXParser.h" #include "WPGBrush.h" #include "WPGPen.h" +#include "WPGBitmap.h" #include <vector> class WPG1Parser : public WPGXParser Index: WPGBrush.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBrush.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPGBrush.cpp 27 Nov 2008 21:42:16 -0000 1.4 +++ WPGBrush.cpp 28 Nov 2008 11:53:03 -0000 1.5 @@ -39,22 +39,6 @@ gradient() {} -#if 0 -libwpg::WPGBrush::WPGBrush(const WPGColor& fore): - style(Solid), - foreColor(fore), - backColor(0xFF,0xFF,0xFF), - gradient() -{} - -libwpg::WPGBrush::WPGBrush(const WPGColor& fore, const WPGColor& back): - style(Solid), - foreColor(fore), - backColor(back), - gradient() -{} -#endif - libwpg::WPGBrush::WPGBrush(const WPGBrush& brush): style(brush.style), foreColor(brush.foreColor), Index: WPGXParser.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGXParser.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- WPGXParser.h 11 Dec 2007 14:44:32 -0000 1.15 +++ WPGXParser.h 28 Nov 2008 11:53:03 -0000 1.16 @@ -45,7 +45,6 @@ unsigned char readU8(); unsigned short readU16(); unsigned int readU32(); - signed char readS8(); short readS16(); int readS32(); unsigned int readVariableLengthInteger(); Index: WPGPaintInterface.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGPaintInterface.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- WPGPaintInterface.h 27 Nov 2008 21:42:16 -0000 1.15 +++ WPGPaintInterface.h 28 Nov 2008 11:53:03 -0000 1.16 @@ -27,7 +27,6 @@ #ifndef __WPGPAINTINTERFACE_H__ #define __WPGPAINTINTERFACE_H__ -#include "WPGBitmap.h" #include <libwpd/libwpd.h> #include "WPGBrush.h" #include "WPGPen.h" @@ -66,8 +65,6 @@ virtual void drawPath(const ::WPXPropertyListVector& path) = 0; - virtual void drawBitmap(const ::WPXPropertyList &propList, const WPGBitmap& bitmap) = 0; - virtual void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData) = 0; // none of the other callback functions will be called after this function is called Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/Makefile.am,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Makefile.am 27 Nov 2008 16:33:00 -0000 1.31 +++ Makefile.am 28 Nov 2008 11:53:03 -0000 1.32 @@ -27,7 +27,6 @@ WPGPen.h \ WPGBrush.h \ WPGGradient.h \ - WPGBitmap.h \ WPGPaintInterface.h AM_CXXFLAGS = $(LIBWPG_CXXFLAGS) $(DEBUG_CXXFLAGS) Index: WPGPen.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGPen.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- WPGPen.cpp 27 Nov 2008 21:42:16 -0000 1.8 +++ WPGPen.cpp 28 Nov 2008 11:53:03 -0000 1.9 @@ -83,28 +83,6 @@ { } -#if 0 -libwpg::WPGPen::WPGPen(const WPGColor& fore): - foreColor(fore), - backColor(0xFF,0xFF,0xFF), - width(0), - height(0), - solid(true), - dashArray() -{ -} - -libwpg::WPGPen::WPGPen(const WPGColor& fore, const WPGColor& back): - foreColor(fore), - backColor(back), - width(0), - height(0), - solid(true) , - dashArray() -{ -} -#endif - libwpg::WPGPen::WPGPen(const WPGPen& pen): foreColor(pen.foreColor), backColor(pen.backColor), Index: WPGGradient.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGGradient.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPGGradient.h 27 Nov 2008 21:42:16 -0000 1.3 +++ WPGGradient.h 28 Nov 2008 11:53:03 -0000 1.4 @@ -55,8 +55,6 @@ WPGColor stopColor(unsigned index) const; -// void clear(); - void addStop(double offset, const WPGColor& color); private: Index: WPG2Parser.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.cpp,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- WPG2Parser.cpp 27 Nov 2008 21:42:16 -0000 1.87 +++ WPG2Parser.cpp 28 Nov 2008 11:53:03 -0000 1.88 @@ -1639,6 +1639,7 @@ propList.insert("svg:y", (float)m_bitmap.y1); propList.insert("svg:width", (float)(m_bitmap.x2 - m_bitmap.x1)); propList.insert("svg:height", (float)(m_bitmap.y2 - m_bitmap.y1)); + propList.insert("libwpg:mime-type", "image/bmp"); // format 1: each byte represents 8 pixels, the color fetched from the palette if(color_format == 1) @@ -1653,7 +1654,7 @@ const libwpg::WPGColor& color = m_colorPalette[index]; bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 2: each byte represents 4 pixels, the color fetched from the palette else if(color_format == 2) @@ -1668,7 +1669,7 @@ const libwpg::WPGColor& color = m_colorPalette[index]; bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 3: each byte represents 2 pixels, the color fetched from the palette else if(color_format == 3) @@ -1683,7 +1684,7 @@ const libwpg::WPGColor& color = m_colorPalette[index]; bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 4: each byte represents a pixel, the color fetched from the palette else if(color_format == 4) @@ -1696,7 +1697,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 5: greyscale of 16 bits else if (color_format == 5) @@ -1710,7 +1711,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 6: RGB, with 5 bits per colour else if (color_format == 6) @@ -1724,7 +1725,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } // format 7: else if (color_format == 7) @@ -1738,7 +1739,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } else if (color_format == 8) { @@ -1750,7 +1751,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } else if (color_format == 9) { @@ -1762,7 +1763,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } else if (color_format == 12) { @@ -1775,7 +1776,7 @@ bitmap.setPixel(x, y, color); } - m_painter->drawBitmap(propList, bitmap); + m_painter->drawImageObject(propList, bitmap.getDIB()); } Index: WPGSVGGenerator.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGSVGGenerator.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- WPGSVGGenerator.cpp 27 Nov 2008 21:42:16 -0000 1.21 +++ WPGSVGGenerator.cpp 28 Nov 2008 11:53:03 -0000 1.22 @@ -248,17 +248,6 @@ m_outputSink << "/>\n"; } -void libwpg::WPGSVGGenerator::drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& bitmap) -{ - WPXString base64Bitmap = bitmap.getDIB().getBase64Data(); - m_outputSink << "<image "; - m_outputSink << "x=\"" << doubleToString(72*propList["svg:x"]->getFloat()) << "\" y=\"" << doubleToString(72*propList["svg:y"]->getFloat()) << "\" "; - m_outputSink << "width=\"" << doubleToString(72*propList["svg:width"]->getFloat()) << "\" height=\"" << doubleToString(72*propList["svg:height"]->getFloat()) << "\" "; - m_outputSink << "xlink:href=\"data:image/bmp;base64,"; - m_outputSink << base64Bitmap.cstr(); - m_outputSink << "\" />\n"; -} - void libwpg::WPGSVGGenerator::drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData) { if (!propList["libwpg:mime-type"] || propList["libwpg:mime-type"]->getStr().len() <= 0) Index: WPGPen.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGPen.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPGPen.h 27 Nov 2008 21:42:16 -0000 1.4 +++ WPGPen.h 28 Nov 2008 11:53:03 -0000 1.5 @@ -59,10 +59,6 @@ WPGDashArray dashArray; WPGPen(); -#if 0 - WPGPen(const WPGColor& fore); - WPGPen(const WPGColor& fore, const WPGColor& back); -#endif WPGPen(const WPGPen& pen); WPGPen& operator=(const WPGPen& pen); |
