You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(31) |
Jul
(37) |
Aug
(20) |
Sep
(20) |
Oct
(16) |
Nov
(10) |
Dec
(16) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(11) |
May
(136) |
Jun
(61) |
Jul
(42) |
Aug
(21) |
Sep
(25) |
Oct
(43) |
Nov
(5) |
Dec
(24) |
2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
(51) |
Aug
(6) |
Sep
|
Oct
|
Nov
(21) |
Dec
(35) |
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(10) |
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(35) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
From: Fridrich S. <str...@us...> - 2007-11-16 20:19:37
|
Update of /cvsroot/libwpg/libwpg/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9001/src/lib Modified Files: WPG2Parser.cpp WPGBinaryData.cpp WPGBinaryData.h WPGBitmap.cpp WPGBitmap.h WPGHeader.cpp WPGRect.cpp WPGRect.h WPGString.cpp WPGString.h WPGXParser.cpp WPGraphics.cpp Log Message: some warnings gone Index: WPGString.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGString.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPGString.cpp 8 Jun 2007 11:57:41 -0000 1.4 +++ WPGString.cpp 16 Nov 2007 20:19:26 -0000 1.5 @@ -60,7 +60,7 @@ delete d; } -const bool libwpg::WPGString::empty() const +bool libwpg::WPGString::empty() const { return d->str.empty(); } @@ -70,7 +70,7 @@ return d->str.c_str(); } -const long libwpg::WPGString::length() const +long libwpg::WPGString::length() const { return d->str.length(); } Index: WPGBitmap.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBitmap.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WPGBitmap.h 3 Jul 2007 13:03:19 -0000 1.6 +++ WPGBitmap.h 16 Nov 2007 20:19:26 -0000 1.7 @@ -50,10 +50,10 @@ ~WPGBitmap(); // return width in pixel - const int width() const; + int width() const; // return height in pixel - const int height() const; + int height() const; WPGColor pixel(int x, int y) const; Index: WPGXParser.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGXParser.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- WPGXParser.cpp 21 Jun 2007 10:31:03 -0000 1.13 +++ WPGXParser.cpp 16 Nov 2007 20:19:27 -0000 1.14 @@ -50,7 +50,7 @@ { unsigned short p0 = (unsigned short)readU8(); unsigned short p1 = (unsigned short)readU8(); - return p0|(p1<<8); + return (unsigned short)(p0|(p1<<8)); } unsigned long WPGXParser::readU32() @@ -59,7 +59,7 @@ unsigned long p1 = (unsigned short)readU8(); unsigned long p2 = (unsigned short)readU8(); unsigned long p3 = (unsigned short)readU8(); - return p0|(p1<<8)|(p2<<16)|(p3<<24); + return (unsigned long)(p0|(p1<<8)|(p2<<16)|(p3<<24)); } char WPGXParser::readS8() @@ -74,7 +74,7 @@ { short p0 = readU8(); short p1 = readS8(); - return p0|(p1<<8); + return (short)(p0|(p1<<8)); } long WPGXParser::readS32() @@ -83,7 +83,7 @@ long p1 = readU8(); long p2 = readU8(); long p3 = readS8(); - return p0|(p1<<8)|(p2<<16)|(p3<<24); + return (long)(p0|(p1<<8)|(p2<<16)|(p3<<24)); } unsigned int WPGXParser::readVariableLengthInteger() Index: WPGHeader.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGHeader.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WPGHeader.cpp 9 May 2007 22:34:09 -0000 1.5 +++ WPGHeader.cpp 16 Nov 2007 20:19:26 -0000 1.6 @@ -32,7 +32,7 @@ static inline unsigned short readU16( const void* p ) { const unsigned char* ptr = (const unsigned char*) p; - return ptr[0]+(ptr[1]<<8); + return (unsigned short)(ptr[0]+(ptr[1]<<8)); } static inline unsigned long readU32( const void* p ) Index: WPGRect.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGRect.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WPGRect.cpp 14 Dec 2006 14:39:58 -0000 1.1 +++ WPGRect.cpp 16 Nov 2007 20:19:26 -0000 1.2 @@ -55,12 +55,12 @@ return *this; } -const double libwpg::WPGRect::width() const +double libwpg::WPGRect::width() const { return x2-x1; } -const double libwpg::WPGRect::height() const +double libwpg::WPGRect::height() const { return y2-y1; } Index: WPGraphics.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGraphics.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- WPGraphics.cpp 26 Oct 2007 08:16:07 -0000 1.12 +++ WPGraphics.cpp 16 Nov 2007 20:19:27 -0000 1.13 @@ -123,7 +123,7 @@ { // seek to the start of document graphics->seek(header.startOfDocument(), WPX_SEEK_SET); - tmpMajorVersion = header.majorVersion(); + tmpMajorVersion = (unsigned char)(header.majorVersion()); } else // here we force parsing of headerless pictures Index: WPGBinaryData.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBinaryData.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WPGBinaryData.cpp 3 Jul 2007 13:03:19 -0000 1.2 +++ WPGBinaryData.cpp 16 Nov 2007 20:19:26 -0000 1.3 @@ -89,9 +89,9 @@ m_binaryDataImpl->m_buf.clear(); } -const size_t libwpg::WPGBinaryData::size() const +size_t libwpg::WPGBinaryData::size() const { - return (const size_t)m_binaryDataImpl->m_buf.size(); + return (size_t)m_binaryDataImpl->m_buf.size(); } libwpg::WPGBinaryData& libwpg::WPGBinaryData::operator=(const WPGBinaryData &dataBuf) Index: WPGBitmap.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBitmap.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPGBitmap.cpp 3 Jul 2007 13:03:19 -0000 1.11 +++ WPGBitmap.cpp 16 Nov 2007 20:19:26 -0000 1.12 @@ -70,12 +70,12 @@ d->pixels[i] = bitmap.d->pixels[i]; } -const int libwpg::WPGBitmap::width() const +int libwpg::WPGBitmap::width() const { return d->width; } -const int libwpg::WPGBitmap::height() const +int libwpg::WPGBitmap::height() const { return d->height; } Index: WPGBinaryData.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBinaryData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WPGBinaryData.h 3 Jul 2007 13:03:19 -0000 1.2 +++ WPGBinaryData.h 16 Nov 2007 20:19:26 -0000 1.3 @@ -49,7 +49,7 @@ void append(const char c); void clear(); - const size_t size() const; + size_t size() const; const char *getDataBuffer() const; const WPGString getBase64Data() const; Index: WPGRect.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGRect.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPGRect.h 14 Dec 2006 14:39:58 -0000 1.3 +++ WPGRect.h 16 Nov 2007 20:19:26 -0000 1.4 @@ -47,8 +47,8 @@ WPGRect& operator=(const WPGRect& rect); - const double width() const; - const double height() const; + double width() const; + double height() const; }; } // namespace libwpg Index: WPG2Parser.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- WPG2Parser.cpp 17 Jul 2007 09:34:33 -0000 1.58 +++ WPG2Parser.cpp 16 Nov 2007 20:19:26 -0000 1.59 @@ -1514,7 +1514,7 @@ int count = 1 + (int)readU8(); unsigned char* raster_source = ptr - raster_len; for( ; count; --count) - for(unsigned r = 0; r < raster_len; r++) + for(unsigned long r = 0; r < raster_len; r++) *ptr++ = *raster_source++; } @@ -1524,7 +1524,7 @@ // Xor-ing will happen when about to enter next raster // see after the last if down below xor_raster = true; - int raster_len = data_size * width; + raster_len = data_size * width; next_scanline = ptr + raster_len; } @@ -1564,10 +1564,10 @@ xor_raster = false; // current raster must be XORed with previous raster - int raster_len = data_size * width; + raster_len = data_size * width; unsigned char* current = next_scanline - raster_len; unsigned char* previous = current - raster_len; - for( int r = 0; r < raster_len; r++) + for( unsigned long r = 0; r < raster_len; r++) current[r] ^= previous[r]; } @@ -1666,7 +1666,7 @@ for (unsigned long y = 0; y < height; y++) for (unsigned long x = 0; x < width; x++, i++) { - unsigned short tmpColor = buffer[2*i] | (buffer[2*i+1] << 8); + unsigned short tmpColor = (unsigned short)(buffer[2*i] | (buffer[2*i+1] << 8)); const libwpg::WPGColor color((tmpColor >> 10) & 0x1f, (tmpColor >> 5) & 0x1f, tmpColor & 0x1f); bitmap.setPixel(x, y, color); } @@ -1680,7 +1680,7 @@ for (unsigned long y = 0; y < height; y++) for (unsigned long x = 0; x < width; x++, i++) { - unsigned short tmpColor = buffer[2*i] | (buffer[2*i+1] << 8); + unsigned short tmpColor = (unsigned short)(buffer[2*i] | (buffer[2*i+1] << 8)); const libwpg::WPGColor color(tmpColor & 0x0f, (tmpColor >> 4) & 0x0f, (tmpColor >> 8) & 0x0f, (tmpColor >> 12) & 0x0f); bitmap.setPixel(x, y, color); } @@ -1726,7 +1726,7 @@ } - +#ifdef DEBUG // debugging only if(buffer && 0) { @@ -1737,6 +1737,7 @@ WPG_DEBUG_MSG((" pixel at %li, %li: %3d %3d %3d\n", x, y, color.red, color.green, color.blue)); } } +#endif // discard delete [] buffer; Index: WPGString.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGString.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPGString.h 8 Jun 2007 11:57:41 -0000 1.4 +++ WPGString.h 16 Nov 2007 20:19:27 -0000 1.5 @@ -38,11 +38,11 @@ ~WPGString(); - const bool empty() const; + bool empty() const; const char * cstr() const; - const long length() const; + long length() const; void append(const char c); |
From: Fridrich S. <str...@us...> - 2007-11-16 20:19:37
|
Update of /cvsroot/libwpg/libwpg/src/conv/raw In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9001/src/conv/raw Modified Files: wpg2raw.cpp Log Message: some warnings gone Index: wpg2raw.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- wpg2raw.cpp 26 Oct 2007 08:16:06 -0000 1.6 +++ wpg2raw.cpp 16 Nov 2007 20:19:26 -0000 1.7 @@ -75,7 +75,7 @@ printf("RawPainter::endLayer %d\n", id); } -void RawPainter::setPen(const libwpg::WPGPen& pen) +void RawPainter::setPen(const libwpg::WPGPen& /*pen*/) { printf("RawPainter::setPen\n"); } @@ -107,7 +107,7 @@ brush.gradient.stopColor(c).green, brush.gradient.stopColor(c).blue); } -void RawPainter::setFillRule(FillRule rule) +void RawPainter::setFillRule(FillRule /*rule*/) { printf("RawPainter::setFillRule\n"); } @@ -119,7 +119,7 @@ printf(" Roundndess: %g %g\n", rx, ry); } -void RawPainter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) +void RawPainter::drawEllipse(const libwpg::WPGPoint& /*center*/s, double rx, double ry) { printf("RawPainter::drawEllipse "); printf(" Radius: %g %g\n", rx, ry); @@ -137,12 +137,12 @@ printf("RawPainter::drawPath %d elements\n", path.count()); } -void RawPainter::drawBitmap(const libwpg::WPGBitmap& bitmap) +void RawPainter::drawBitmap(const libwpg::WPGBitmap& /*bitmap*/) { printf("RawPainter::drawBitmap\n"); } -void RawPainter::drawImageObject(const libwpg::WPGBinaryData& binaryData) +void RawPainter::drawImageObject(const libwpg::WPGBinaryData& /*binaryData*/) { printf("RawPainter::drawBinaryData\n"); } |
From: Fridrich S. <str...@us...> - 2007-10-26 08:16:13
|
Update of /cvsroot/libwpg/libwpg/src/conv/svg In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6823/src/conv/svg Modified Files: wpg2svg.cpp Log Message: hide the OLE2 bits from the user of libwpg inside the WPGraphics class Index: wpg2svg.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/svg/wpg2svg.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- wpg2svg.cpp 19 Oct 2007 19:09:09 -0000 1.3 +++ wpg2svg.cpp 26 Oct 2007 08:16:07 -0000 1.4 @@ -38,25 +38,16 @@ } const char* filename = argv[1]; - WPXInputStream* input = new WPXFileStream(filename); - if (input->isOLEStream()) - { - WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); - if (olestream) - { - delete input; - input = olestream; - } - } + WPXFileStream input(filename); - if (!libwpg::WPGraphics::isSupported(input)) + if (!libwpg::WPGraphics::isSupported(&input)) { std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; return 1; } libwpg::WPGString output; - if (!libwpg::WPGraphics::generateSVG(input, output)) + if (!libwpg::WPGraphics::generateSVG(&input, output)) { std::cerr << "ERROR: SVG Generation failed!" << std::endl; return 1; |
From: Fridrich S. <str...@us...> - 2007-10-26 08:16:13
|
Update of /cvsroot/libwpg/libwpg/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6823/src/lib Modified Files: WPGraphics.cpp Log Message: hide the OLE2 bits from the user of libwpg inside the WPGraphics class Index: WPGraphics.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGraphics.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPGraphics.cpp 8 Oct 2007 20:47:26 -0000 1.11 +++ WPGraphics.cpp 26 Oct 2007 08:16:07 -0000 1.12 @@ -43,11 +43,33 @@ */ bool libwpg::WPGraphics::isSupported(WPXInputStream* input) { + WPXInputStream *graphics = 0; + bool isDocumentOLE = false; + + if (input->isOLEStream()) + { + graphics = input->getDocumentOLEStream("PerfectOffice_MAIN"); + if (graphics) + isDocumentOLE = true; + else + return false; + } + else + graphics = input; + WPGHeader header; - if(!header.load(input)) + if(!header.load(graphics)) + { + if (graphics && isDocumentOLE) + delete graphics; return false; + } - return header.isSupported(); + bool retVal = header.isSupported(); + + if (graphics && isDocumentOLE) + delete graphics; + return retVal; } /** @@ -62,6 +84,20 @@ { WPGXParser *parser = 0; + WPXInputStream *graphics = 0; + bool isDocumentOLE = false; + + if (input->isOLEStream()) + { + graphics = input->getDocumentOLEStream("PerfectOffice_MAIN"); + if (graphics) + isDocumentOLE = true; + else + return false; + } + else + graphics = input; + WPG_DEBUG_MSG(("Loading header...\n")); unsigned char tmpMajorVersion = 0x00; if (fileFormat == WPG_WPG1) @@ -69,43 +105,53 @@ else if (fileFormat == WPG_WPG2) tmpMajorVersion = 0x02; WPGHeader header; - if(!header.load(input)) + if(!header.load(graphics)) + { + if (graphics && isDocumentOLE) + delete graphics; return false; + } if(!header.isSupported() && (fileFormat == WPG_AUTODETECT)) { WPG_DEBUG_MSG(("Unsupported file format!\n")); + if (graphics && isDocumentOLE) + delete graphics; return false; } else if (header.isSupported()) { // seek to the start of document - input->seek(header.startOfDocument(), WPX_SEEK_SET); + graphics->seek(header.startOfDocument(), WPX_SEEK_SET); tmpMajorVersion = header.majorVersion(); } else // here we force parsing of headerless pictures - input->seek(0, WPX_SEEK_SET); + graphics->seek(0, WPX_SEEK_SET); bool retval; switch (tmpMajorVersion) { case 0x01: // WPG1 WPG_DEBUG_MSG(("Parsing WPG1\n")); - parser = new WPG1Parser(input, painter); + parser = new WPG1Parser(graphics, painter); retval = parser->parse(); break; case 0x02: // WPG2 WPG_DEBUG_MSG(("Parsing WPG2\n")); - parser = new WPG2Parser(input, painter); + parser = new WPG2Parser(graphics, painter); retval = parser->parse(); break; default: // other :-) WPG_DEBUG_MSG(("Unknown format\n")); + if (graphics && isDocumentOLE) + delete graphics; return false; } if (parser) delete parser; + if (graphics && isDocumentOLE) + delete graphics; return retval; } |
From: Fridrich S. <str...@us...> - 2007-10-26 08:16:13
|
Update of /cvsroot/libwpg/libwpg/src/conv/raw In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6823/src/conv/raw Modified Files: wpg2raw.cpp Log Message: hide the OLE2 bits from the user of libwpg inside the WPGraphics class Index: wpg2raw.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- wpg2raw.cpp 19 Oct 2007 19:09:09 -0000 1.5 +++ wpg2raw.cpp 26 Oct 2007 08:16:06 -0000 1.6 @@ -156,27 +156,17 @@ } const char* filename = argv[1]; - WPXInputStream* input = new WPXFileStream(filename); - if (input->isOLEStream()) - { - WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); - if (olestream) - { - delete input; - input = olestream; - } - } + WPXFileStream input(filename); - if (!libwpg::WPGraphics::isSupported(input)) + if (!libwpg::WPGraphics::isSupported(&input)) { fprintf(stderr, "ERROR: Unsupported file format (unsupported version) or file is encrypted!\n"); return 1; } RawPainter painter; - libwpg::WPGraphics::parse(input, &painter); + libwpg::WPGraphics::parse(&input, &painter); - delete input; return 0; } |
From: Fridrich S. <str...@us...> - 2007-10-19 19:09:14
|
Update of /cvsroot/libwpg/libwpg/src/conv/raw In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9701/src/conv/raw Modified Files: wpg2raw.cpp Log Message: adapt to the new location of libwpd-stream headers Index: wpg2raw.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- wpg2raw.cpp 8 Oct 2007 20:47:26 -0000 1.4 +++ wpg2raw.cpp 19 Oct 2007 19:09:09 -0000 1.5 @@ -28,7 +28,7 @@ #include <stdio.h> #include "libwpg.h" -#include <libwpd/WPXStreamImplementation.h> +#include <libwpd-stream/WPXStreamImplementation.h> class RawPainter : public libwpg::WPGPaintInterface { public: |
From: Fridrich S. <str...@us...> - 2007-10-19 19:09:14
|
Update of /cvsroot/libwpg/libwpg/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9701/src/lib Modified Files: WPGHeader.h WPGInternalStream.h WPGXParser.h Log Message: adapt to the new location of libwpd-stream headers Index: WPGHeader.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGHeader.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPGHeader.h 20 Apr 2007 09:43:36 -0000 1.3 +++ WPGHeader.h 19 Oct 2007 19:09:09 -0000 1.4 @@ -27,7 +27,7 @@ #ifndef __WPGHEADER_H__ #define __WPGHEADER_H__ -#include <libwpd/WPXStream.h> +#include <libwpd-stream/WPXStream.h> class WPGHeader { Index: WPGInternalStream.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGInternalStream.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPGInternalStream.h 19 Oct 2007 13:12:53 -0000 1.3 +++ WPGInternalStream.h 19 Oct 2007 19:09:09 -0000 1.4 @@ -24,7 +24,7 @@ #ifndef WPGINTERNALSTREAM_H #define WPGINTERNALSTREAM_H -#include <libwpd/WPXStream.h> +#include <libwpd-stream/WPXStream.h> class WPGInternalInputStream : public WPXInputStream { Index: WPGXParser.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGXParser.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- WPGXParser.h 9 May 2007 22:34:09 -0000 1.12 +++ WPGXParser.h 19 Oct 2007 19:09:09 -0000 1.13 @@ -29,7 +29,7 @@ #define __WPGXPARSER_H__ #include "WPGPaintInterface.h" -#include <libwpd/WPXStream.h> +#include <libwpd-stream/WPXStream.h> #include "WPGColor.h" #include <map> |
From: Fridrich S. <str...@us...> - 2007-10-19 19:09:14
|
Update of /cvsroot/libwpg/libwpg/src/conv/svg In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9701/src/conv/svg Modified Files: wpg2svg.cpp Log Message: adapt to the new location of libwpd-stream headers Index: wpg2svg.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/svg/wpg2svg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wpg2svg.cpp 8 Oct 2007 20:47:26 -0000 1.2 +++ wpg2svg.cpp 19 Oct 2007 19:09:09 -0000 1.3 @@ -26,7 +26,7 @@ #include <iostream> #include <sstream> #include "libwpg.h" -#include <libwpd/WPXStreamImplementation.h> +#include <libwpd-stream/WPXStreamImplementation.h> int main(int argc, char *argv[]) |
From: Fridrich S. <str...@us...> - 2007-10-19 18:52:15
|
Update of /cvsroot/libwpg/libwpg In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1825 Modified Files: configure.in libwpg-0.2.pc.in Log Message: adapt to the reality of libwpd Index: libwpg-0.2.pc.in =================================================================== RCS file: /cvsroot/libwpg/libwpg/libwpg-0.2.pc.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libwpg-0.2.pc.in 8 Oct 2007 20:47:25 -0000 1.2 +++ libwpg-0.2.pc.in 19 Oct 2007 18:52:10 -0000 1.3 @@ -6,6 +6,6 @@ Name: libwpg-@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@ Description: Library for importing and converting Corel WordPerfect(tm) Graphics images Version: @VERSION@ -Requires: libwpd-0.9 +Requires: libwpd-stream-0.9 Libs: -L${libdir} -lwpg-@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@ Cflags: -I${includedir}/libwpg-@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@ Index: configure.in =================================================================== RCS file: /cvsroot/libwpg/libwpg/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure.in 8 Oct 2007 20:47:25 -0000 1.16 +++ configure.in 19 Oct 2007 18:52:10 -0000 1.17 @@ -70,7 +70,6 @@ dnl *********************************************************************************** PKG_CHECK_MODULES(LIBWPG,[ -libwpd-0.9 >= $LIBWPD_REQUIRED_VERSION libwpd-stream-0.9 >= $LIBWPD_REQUIRED_VERSION ]) |
From: Fridrich S. <str...@us...> - 2007-10-19 13:12:57
|
Update of /cvsroot/libwpg/libwpg/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24678/src/lib Modified Files: WPGInternalStream.cpp WPGInternalStream.h Removed Files: WPGStreamImplementation.cpp Log Message: removing some unnecessary use of uint8_t in favour of unsigned char Index: WPGInternalStream.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGInternalStream.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPGInternalStream.cpp 8 Oct 2007 20:47:26 -0000 1.4 +++ WPGInternalStream.cpp 19 Oct 2007 13:12:49 -0000 1.5 @@ -40,7 +40,7 @@ delete [] m_tmpBuf; } -const uint8_t * WPGInternalInputStream::read(size_t numBytes, size_t &numBytesRead) +const unsigned char * WPGInternalInputStream::read(size_t numBytes, size_t &numBytesRead) { numBytesRead = 0; @@ -63,7 +63,7 @@ if (numBytesToRead == 0) return 0; - m_tmpBuf = new uint8_t[numBytesToRead]; + m_tmpBuf = new unsigned char[numBytesToRead]; for (size_t i=0; (long)i<(long)numBytesToRead; i++) { m_tmpBuf[i] = m_data[m_offset]; --- WPGStreamImplementation.cpp DELETED --- Index: WPGInternalStream.h =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGInternalStream.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WPGInternalStream.h 8 Oct 2007 20:47:26 -0000 1.2 +++ WPGInternalStream.h 19 Oct 2007 13:12:53 -0000 1.3 @@ -35,7 +35,7 @@ virtual bool isOLEStream() { return false; } virtual WPXInputStream * getDocumentOLEStream(const char* /*name*/) { return 0; } - const virtual uint8_t *read(size_t numBytes, size_t &numBytesRead); + const virtual unsigned char *read(size_t numBytes, size_t &numBytesRead); virtual int seek(long offset, WPX_SEEK_TYPE seekType); virtual long tell(); virtual bool atEOS(); |
From: Fridrich S. <str...@us...> - 2007-10-15 08:04:45
|
Update of /cvsroot/libwpg/wpg2odg/filter In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19554/filter Modified Files: OdgExporter.cxx Log Message: make the angle int Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpg/wpg2odg/filter/OdgExporter.cxx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- OdgExporter.cxx 3 Jul 2007 21:15:55 -0000 1.14 +++ OdgExporter.cxx 15 Oct 2007 08:04:38 -0000 1.15 @@ -586,7 +586,7 @@ while(angle > 360) angle -= 360; - m_value << doubleToString(angle*10); + m_value << (unsigned)(angle*10); tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); m_value.str(""); |
From: Fridrich S. <str...@us...> - 2007-10-11 12:01:40
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27394/src Modified Files: mainwindow.cpp Log Message: allow to zoom in untill 800% (can be useful). Should I change the zoom-in and zoom-out hotkeys to up and down arrows? Index: mainwindow.cpp =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/mainwindow.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mainwindow.cpp 11 Oct 2007 09:19:24 -0000 1.23 +++ mainwindow.cpp 11 Oct 2007 12:01:35 -0000 1.24 @@ -171,7 +171,7 @@ if(d->view->zoomLevel() <= 25) d->zoomOutAction->setEnabled(false); - if(d->view->zoomLevel() >= 200) + if(d->view->zoomLevel() >= 800) d->zoomInAction->setEnabled(false); if(en) |
From: Fridrich S. <str...@us...> - 2007-10-11 11:48:42
|
Update of /cvsroot/libwpg/perfectspot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21330 Modified Files: .cvsignore Log Message: stuffing the .cvsignore files a bit Index: .cvsignore =================================================================== RCS file: /cvsroot/libwpg/perfectspot/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 5 Oct 2007 13:34:32 -0000 1.1 +++ .cvsignore 11 Oct 2007 11:48:38 -0000 1.2 @@ -1,4 +1,6 @@ CMakeCache.txt CMakeFiles Makefile -cmake_install.cmake +*.cmake +_CPack_Packages +install_manifest.txt |
From: Fridrich S. <str...@us...> - 2007-10-11 11:48:42
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21330/src Modified Files: .cvsignore Log Message: stuffing the .cvsignore files a bit Index: .cvsignore =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 5 Oct 2007 13:34:58 -0000 1.1 +++ .cvsignore 11 Oct 2007 11:48:38 -0000 1.2 @@ -1,3 +1,4 @@ +CMakeCache.txt CMakeFiles Makefile *.moc |
From: Fridrich S. <str...@us...> - 2007-10-11 11:44:21
|
Update of /cvsroot/libwpg/perfectspot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19376 Modified Files: perfectspot.spec Log Message: this allows us to have make install install exactly the same files as the rpm would do Index: perfectspot.spec =================================================================== RCS file: /cvsroot/libwpg/perfectspot/perfectspot.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- perfectspot.spec 9 Oct 2007 15:31:41 -0000 1.2 +++ perfectspot.spec 11 Oct 2007 11:44:16 -0000 1.3 @@ -4,7 +4,7 @@ # norootforbuild Name: perfectspot -BuildRequires: cmake libqt4-devel update-desktop-files +BuildRequires: cmake libqt4-devel BuildRequires: gcc-c++, libstdc++-devel, pkgconfig BuildRequires: libwpg-devel >= 0.1.0 BuildRequires: libwpd-devel >= 0.8.0 @@ -41,7 +41,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -%suse_update_desktop_file -c %name "Perfectspot" "WordPerfect Graphics Viewer" perfectspot perfectspot "Graphics Viewer" %clean rm -rf $RPM_BUILD_ROOT |
From: Fridrich S. <str...@us...> - 2007-10-11 11:44:21
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19376/src Modified Files: CMakeLists.txt Added Files: perfectspot.desktop Log Message: this allows us to have make install install exactly the same files as the rpm would do Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/CMakeLists.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CMakeLists.txt 9 Oct 2007 15:31:41 -0000 1.7 +++ CMakeLists.txt 11 Oct 2007 11:44:17 -0000 1.8 @@ -35,3 +35,4 @@ install(TARGETS ${PROGNAME} DESTINATION bin) install(FILES perfectspot.png DESTINATION share/pixmaps) +install(FILES perfectspot.desktop DESTINATION share/applications) --- NEW FILE: perfectspot.desktop --- [Desktop Entry] Categories=Graphics;Viewer Name=Perfectspot GenericName=WordPerfect Graphics Viewer Type=Application Exec=perfectspot Icon=perfectspot X-SuSE-translate=true |
From: Ariya H. <ar...@us...> - 2007-10-11 10:03:48
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3893 Modified Files: aboutbox.cpp Log Message: credit for Nuvola icons Index: aboutbox.cpp =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/aboutbox.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- aboutbox.cpp 5 Oct 2007 09:43:31 -0000 1.6 +++ aboutbox.cpp 11 Oct 2007 10:03:43 -0000 1.7 @@ -248,6 +248,14 @@ msg += "</p>"; msg += "<p>"; + msg += tr( "Icons are from Nuvola icon set." ); + msg += "<br>"; + msg += tr( "See <a href=\"http://www.icon-king.com/?p=15/\">http://www.icon-king.com/?p=15</a> for more information"); + msg += "</p>"; + + msg += "<p>"; + + msg += "<p>"; msg += tr("This program is free software; you can redistribute it and/or " "modify it under the terms of the GNU General Public License " "as published by the Free Software Foundation; either version 2 " |
From: Ariya H. <ar...@us...> - 2007-10-11 09:19:28
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18551 Modified Files: mainwindow.cpp Log Message: simplify shortcuts Index: mainwindow.cpp =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/mainwindow.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mainwindow.cpp 11 Oct 2007 09:16:57 -0000 1.22 +++ mainwindow.cpp 11 Oct 2007 09:19:24 -0000 1.23 @@ -140,11 +140,11 @@ connect(d->websiteAction, SIGNAL(triggered()), this, SLOT(gotoWebSite())); #endif - d->openAction->setShortcut(QKeySequence(tr("Ctrl+O"))); - d->exportAction->setShortcut(QKeySequence(tr("Ctrl+E"))); - d->quitAction->setShortcut(QKeySequence(tr("Ctrl+Q"))); - d->zoomInAction->setShortcut(QKeySequence(tr("+"))); - d->zoomOutAction->setShortcut(QKeySequence(tr("-"))); + d->openAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_O)); + d->exportAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_E)); + d->quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); + d->zoomInAction->setShortcut(QKeySequence(Qt::Key_Plus)); + d->zoomOutAction->setShortcut(QKeySequence(Qt::Key_Minus)); d->rotateLeftAction->setShortcut(QKeySequence(Qt::Key_Left)); d->rotateRightAction->setShortcut(QKeySequence(Qt::Key_Right)); |
From: Ariya H. <ar...@us...> - 2007-10-11 09:17:01
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17396 Modified Files: mainwindow.cpp Log Message: left and right arrow to rotate Index: mainwindow.cpp =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/mainwindow.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- mainwindow.cpp 5 Oct 2007 09:30:55 -0000 1.21 +++ mainwindow.cpp 11 Oct 2007 09:16:57 -0000 1.22 @@ -145,8 +145,8 @@ d->quitAction->setShortcut(QKeySequence(tr("Ctrl+Q"))); d->zoomInAction->setShortcut(QKeySequence(tr("+"))); d->zoomOutAction->setShortcut(QKeySequence(tr("-"))); - d->rotateLeftAction->setShortcut(QKeySequence(tr("L"))); - d->rotateRightAction->setShortcut(QKeySequence(tr("R"))); + d->rotateLeftAction->setShortcut(QKeySequence(Qt::Key_Left)); + d->rotateRightAction->setShortcut(QKeySequence(Qt::Key_Right)); d->zoomLabel = new QLabel(statusBar()); d->zoomLabel->setMargin(2); |
From: Ariya H. <ar...@us...> - 2007-10-09 16:03:45
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2815/src Modified Files: canvas.cpp Log Message: give some more space Index: canvas.cpp =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/canvas.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- canvas.cpp 21 May 2007 10:19:42 -0000 1.22 +++ canvas.cpp 9 Oct 2007 13:34:33 -0000 1.23 @@ -262,7 +262,7 @@ { int m = 5; int flags = Qt::AlignLeft | Qt::AlignVCenter; - QRect r = painter.boundingRect(15, 15, 100, 20, flags, info); + QRect r = painter.boundingRect(20, 20, 100, 20, flags, info); painter.setPen(Qt::black); painter.setBrush(QColor(255,255,220,192)); painter.drawRect(r.adjusted(-m, -m, m, m)); |
From: Ariya H. <ar...@us...> - 2007-10-09 16:03:44
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2855/src Modified Files: CMakeLists.txt Log Message: allow installation using "make install" Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/CMakeLists.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMakeLists.txt 5 Oct 2007 11:10:59 -0000 1.5 +++ CMakeLists.txt 9 Oct 2007 13:35:26 -0000 1.6 @@ -32,3 +32,5 @@ add_executable(perfectspot ${perfectspot_SOURCES} ${perfectspot_RESOURCES_SOURCES}) target_link_libraries(perfectspot ${QT_LIBRARIES} ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) + +install(TARGETS ${PROGNAME} DESTINATION bin) |
From: Ariya H. <ar...@us...> - 2007-10-09 16:03:43
|
Update of /cvsroot/libwpg/perfectspot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3701 Modified Files: CMakeLists.txt Log Message: use cpack (requires cmake >= 2.4.2) to ease creating source tarball Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/libwpg/perfectspot/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 17 May 2007 13:48:10 -0000 1.2 +++ CMakeLists.txt 9 Oct 2007 13:37:16 -0000 1.3 @@ -1,6 +1,7 @@ project(perfectspot) +set(PROGNAME perfectspot) -cmake_minimum_required(VERSION 2.4.0) +cmake_minimum_required(VERSION 2.4.2) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE OFF) @@ -24,3 +25,13 @@ add_subdirectory(src) +# for making a source tarball +# note: adjust version and package filename before making a release +set(CPACK_PACKAGE_VERSION_MAJOR "0") +set(CPACK_PACKAGE_VERSION_MINOR "0") +set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "perfectspot-0.0.1") +set(CPACK_PACKAGE_NAME ${PROGNAME}) +set(CPACK_SOURCE_GENERATOR "TGZ") +#set(CPACK_PACKAGE_VENDOR "libwpg.sf.net") +include(CPack) |
From: Ariya H. <ar...@us...> - 2007-10-09 16:03:43
|
Update of /cvsroot/libwpg/perfectspot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8038 Added Files: perfectspot.spec Log Message: add rudimentary .spec file Note: it may not work and only tested in latest OpenSUSE --- NEW FILE: perfectspot.spec --- # # spec file for package perfectspot # norootforbuild Name: perfectspot BuildRequires: cmake libqt4-devel update-desktop-files BuildRequires: gcc-c++, libstdc++-devel, pkgconfig BuildRequires: libwpg-devel >= 0.1.0 BuildRequires: libwpd-devel >= 0.8 Requires: libwpg >= 0.1.0 URL: http://libwpg.sourceforge.net License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: WordPerfect Graphics Viewer Version: 0.0.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: perfectspot-%{version}.tar.gz %description A tool to view WordPerfect Graphics (WPG) pictures Authors: -------- Ariya Hidayat <ar...@kd...> %prep %setup -q -n perfectspot-%{version} %build export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" EXTRA_FLAGS="" if [ %_lib = lib64 ]; then EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" fi cmake . -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=/usr $EXTRA_FLAGS make %{?jobs:-j %jobs} %install make DESTDIR=$RPM_BUILD_ROOT install %suse_update_desktop_file -c %name "Perfectspot" "WordPerfect Graphics Viewer" perfectspot perfectspot "Graphics Viewer" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/bin/perfectspot /usr/share/applications/perfectspot.desktop %changelog * Tue Oct 09 2007 ar...@kd... - test |
From: Ariya H. <ar...@us...> - 2007-10-09 16:03:41
|
Update of /cvsroot/libwpg/libwpg-www In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16000 Modified Files: faq.htm Log Message: minor fix Index: faq.htm =================================================================== RCS file: /cvsroot/libwpg/libwpg-www/faq.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- faq.htm 23 May 2007 11:29:35 -0000 1.3 +++ faq.htm 9 Oct 2007 14:04:01 -0000 1.4 @@ -63,9 +63,9 @@ <p><b>How can I convert WPG pictures to PDF?</b></p> - <p>Use <a href="perfectspot.htm">Perfectspot</a> to open the picture. Then choose menu File, Export. Set the file type to PDF, give the file name, and then click OK.</p> + <p>Use <a href="perfectspot.htm">Perfectspot</a> to open the picture. Then choose menu File, Convert to PDF. Give the output file name, and then click OK.</p> - <p><b>How can I convert some WPG files to SVG or ODG? I do not to run wpg2svg or wpg2odg on those files one by one.</b></p> + <p><b>How can I convert some WPG files to SVG or ODG? I do not want to run wpg2svg or wpg2odg on those files one by one.</b></p> <p>Use the Perl scripts <i>wpg2svgbatch.pl</i> or <i>wpg2odgbatch.pl</i>. Please read the following:</p> <ul> |
From: Fridrich S. <str...@us...> - 2007-10-09 15:31:46
|
Update of /cvsroot/libwpg/perfectspot/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22547/src Modified Files: CMakeLists.txt Log Message: install and package the icon too Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/libwpg/perfectspot/src/CMakeLists.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CMakeLists.txt 9 Oct 2007 13:35:26 -0000 1.6 +++ CMakeLists.txt 9 Oct 2007 15:31:41 -0000 1.7 @@ -34,3 +34,4 @@ target_link_libraries(perfectspot ${QT_LIBRARIES} ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) install(TARGETS ${PROGNAME} DESTINATION bin) +install(FILES perfectspot.png DESTINATION share/pixmaps) |