X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51dba3f868be76351d7351aba528ceec5111070c..ca13514849bc5017c025094b7254aab6c87dda87:/src/common/imagpcx.cpp?ds=sidebyside diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index d28a456f6a..00ebb750a6 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -2,13 +2,13 @@ // Name: imagpcx.cpp // Purpose: wxImage PCX handler // Author: Guillermo Rodriguez Garcia -// Version: 1.00 +// Version: 1.1 // CVS-ID: $Id$ // Copyright: (c) 1999 Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imagpcx.h" #endif @@ -21,9 +21,10 @@ #ifndef WX_PRECOMP # include "wx/defs.h" +# include "wx/palette.h" #endif -#if wxUSE_STREAMS && wxUSE_PCX +#if wxUSE_IMAGE && wxUSE_PCX #include "wx/imagpcx.h" #include "wx/wfstream.h" @@ -35,6 +36,14 @@ #include "wx/list.h" #include "wx/object.h" +//----------------------------------------------------------------------------- +// wxPCXHandler +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler) + +#if wxUSE_STREAMS + //----------------------------------------------------------------------------- // RLE encoding and decoding //----------------------------------------------------------------------------- @@ -56,8 +65,8 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) { data = (unsigned char) *(p++); - // Up to 63 bytes with the same value can be stored using a - // single { cont, value } pair. + // Up to 63 bytes with the same value can be stored using + // a single { cont, value } pair. // if ((data == last) && (cont < 63)) { @@ -65,8 +74,7 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) } else { - // Need to write a 'counter' byte? - // + // need to write a 'counter' byte? if ((cont > 1) || ((last & 0xC0) == 0xC0)) s.PutC((char) (cont | 0xC0)); @@ -76,8 +84,7 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) } } - // Write the last one and return; - // + // write the last one and return; if ((cont > 1) || ((last & 0xC0) == 0xC0)) s.PutC((char) (cont | 0xC0)); @@ -93,7 +100,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s) // end of each plane inside a scanline). Only use this function // to read one or more _complete_ scanlines. Else, more than // 'size' bytes might be read and the buffer might overflow. - // + while (size > 0) { data = (unsigned char)s.GetC(); @@ -101,10 +108,10 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s) // If ((data & 0xC0) != 0xC0), then the value read is a data // byte. Else, it is a counter (cont = val & 0x3F) and the // next byte is the data byte. - // + if ((data & 0xC0) != 0xC0) { - *(p++) = data; + *(p++) = (unsigned char)data; size--; } else @@ -112,7 +119,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s) cont = data & 0x3F; data = (unsigned char)s.GetC(); for (i = 1; i <= cont; i++) - *(p++) = data; + *(p++) = (unsigned char)data; size -= cont; } } @@ -172,13 +179,13 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // Read PCX header and check the version number (it must // be at least 5 or higher for 8 bit and 24 bit images). - // + stream.Read(hdr, 128); if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR; // Extract all image info from the PCX header. - // + encoding = hdr[HDR_ENCODING]; nplanes = hdr[HDR_NPLANES]; bitsperpixel = hdr[HDR_BITSPERPIXEL]; @@ -190,7 +197,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // Check image format. Currently supported formats are // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes). - // + if ((nplanes == 3) && (bitsperpixel == 8)) format = wxPCX_24BIT; else if ((nplanes == 1) && (bitsperpixel == 8)) @@ -209,9 +216,8 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // and another to replace 'colour indexes' with RGB // values. - // Resize the image and allocate memory for a scanline. - // + image->Create(width, height); if (!image->Ok()) @@ -222,7 +228,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // Now start reading the file, line by line, and store // the data in the format required by wxImage. - // + dst = image->GetData(); for (j = height; j; j--) @@ -261,7 +267,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // For 8 bit images, we read the palette, and then do a second // pass replacing indexes with their RGB values; - // + if (format == wxPCX_8BIT) { unsigned char index; @@ -279,6 +285,19 @@ int ReadPCX(wxImage *image, wxInputStream& stream) *(p++) = pal[3 * index + 1]; *(p++) = pal[3 * index + 2]; } + +#if wxUSE_PALETTE + unsigned char r[256]; + unsigned char g[256]; + unsigned char b[256]; + for (i = 0; i < 256; i++) + { + r[i] = pal[3*i + 0]; + g[i] = pal[3*i + 1]; + b[i] = pal[3*i + 2]; + } + image->SetPalette(wxPalette(256, r, g, b)); +#endif // wxUSE_PALETTE } return wxPCX_OK; @@ -287,8 +306,9 @@ int ReadPCX(wxImage *image, wxInputStream& stream) // SavePCX: // Saves a PCX file into the wxImage object pointed by image. // Returns wxPCX_OK on success, or an error code otherwise -// (see above for error codes). Currently, always saves images -// in 24 bit format. XXX +// (see above for error codes). Will try to save as 8-bit +// PCX if possible, and then fall back to 24-bit if there +// are more than 256 different colours. // int SavePCX(wxImage *image, wxOutputStream& stream) { @@ -298,17 +318,17 @@ int SavePCX(wxImage *image, wxOutputStream& stream) unsigned char *src; // pointer into wxImage data unsigned int width, height; // size of the image unsigned int bytesperline; // bytes per line (each plane) - int nplanes = 3; // number of planes + unsigned char nplanes = 3; // number of planes int format = wxPCX_24BIT; // image format (8 bit, 24 bit) - wxHashTable h(wxKEY_INTEGER); // image histogram + wxImageHistogram histogram; // image histogram unsigned long key; // key in the hashtable unsigned int i; - + // See if we can save as 8 bit. - // + if (image->CountColours(256) <= 256) { - image->ComputeHistogram(h); + image->ComputeHistogram(histogram); format = wxPCX_8BIT; nplanes = 1; } @@ -316,7 +336,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // Get image dimensions, calculate bytesperline (must be even, // according to PCX specs) and allocate space for one complete // scanline. - // + if (!image->Ok()) return wxPCX_INVFORMAT; @@ -331,7 +351,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // Build header data and write it to the stream. Initially, // set all bytes to zero (most values default to zero). - // + memset(hdr, 0, sizeof(hdr)); hdr[HDR_MANUFACTURER] = 10; @@ -339,18 +359,18 @@ int SavePCX(wxImage *image, wxOutputStream& stream) hdr[HDR_ENCODING] = 1; hdr[HDR_NPLANES] = nplanes; hdr[HDR_BITSPERPIXEL] = 8; - hdr[HDR_BYTESPERLINE] = bytesperline % 256; - hdr[HDR_BYTESPERLINE + 1] = bytesperline / 256; - hdr[HDR_XMAX] = (width - 1) % 256; - hdr[HDR_XMAX + 1] = (width - 1) / 256; - hdr[HDR_YMAX] = (height - 1) % 256; - hdr[HDR_YMAX + 1] = (height - 1) / 256; + hdr[HDR_BYTESPERLINE] = (unsigned char)(bytesperline % 256); + hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256); + hdr[HDR_XMAX] = (unsigned char)((width - 1) % 256); + hdr[HDR_XMAX + 1] = (unsigned char)((width - 1) / 256); + hdr[HDR_YMAX] = (unsigned char)((height - 1) % 256); + hdr[HDR_YMAX + 1] = (unsigned char)((height - 1) / 256); hdr[HDR_PALETTEINFO] = 1; stream.Write(hdr, 128); // Encode image data line by line and write it to the stream - // + src = image->GetData(); for (; height; height--) @@ -360,7 +380,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream) case wxPCX_8BIT: { unsigned char r, g, b; - wxHNode *hnode; for (i = 0; i < width; i++) { @@ -369,8 +388,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) b = *(src++); key = (r << 16) | (g << 8) | b; - hnode = (wxHNode *) h.Get(key); - p[i] = hnode->index; + p[i] = (unsigned char)histogram[key].index; } break; } @@ -388,29 +406,25 @@ int SavePCX(wxImage *image, wxOutputStream& stream) RLEencode(p, bytesperline * nplanes, stream); } - + free(p); - // For 8 bit images, build the palette and write it to the stream - // + // For 8 bit images, build the palette and write it to the stream: if (format == wxPCX_8BIT) { - wxNode *node; - wxHNode *hnode; - // zero unused colours memset(pal, 0, sizeof(pal)); - h.BeginFind(); - while ((node = h.Next()) != NULL) - { - key = node->GetKeyInteger(); - hnode = (wxHNode *) node->GetData(); + unsigned long index; - pal[3 * hnode->index] = (unsigned char)(key >> 16); - pal[3 * hnode->index + 1] = (unsigned char)(key >> 8); - pal[3 * hnode->index + 2] = (unsigned char)(key); - delete hnode; + for (wxImageHistogram::iterator entry = histogram.begin(); + entry != histogram.end(); ++entry ) + { + key = entry->first; + index = entry->second.index; + pal[3 * index] = (unsigned char)(key >> 16); + pal[3 * index + 1] = (unsigned char)(key >> 8); + pal[3 * index + 2] = (unsigned char)(key); } stream.PutC(12); @@ -424,8 +438,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // wxPCXHandler //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler) - bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) { int error; @@ -435,7 +447,7 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose if (verbose) wxLogError(_("PCX: this is not a PCX file.")); - return FALSE; + return false; } image->Destroy(); @@ -446,17 +458,17 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose { switch (error) { - case wxPCX_INVFORMAT: wxLogError(_("wxPCXHandler: image format unsupported")); break; - case wxPCX_MEMERR: wxLogError(_("wxPCXHandler: couldn't allocate memory")); break; - case wxPCX_VERERR: wxLogError(_("wxPCXHandler: version number too low")); break; - default: wxLogError(_("wxPCXHandler: unknown error !!!")); + case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break; + case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; + case wxPCX_VERERR: wxLogError(_("PCX: version number too low")); break; + default: wxLogError(_("PCX: unknown error !!!")); } } image->Destroy(); - return FALSE; + return false; } - return TRUE; + return true; } bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) @@ -469,9 +481,9 @@ bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos { switch (error) { - case wxPCX_INVFORMAT: wxLogError(_("wxPCXHandler: invalid image")); break; - case wxPCX_MEMERR: wxLogError(_("wxPCXHandler: couldn't allocate memory")); break; - default: wxLogError(_("wxPCXHandler: unknown error !!!")); + case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break; + case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; + default: wxLogError(_("PCX: unknown error !!!")); } } } @@ -481,14 +493,15 @@ bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos bool wxPCXHandler::DoCanRead( wxInputStream& stream ) { - unsigned char c; - - c = stream.GetC(); - stream.SeekI(-1, wxFromCurrent); + unsigned char c = stream.GetC(); + if ( !stream ) + return false; // not very safe, but this is all we can get from PCX header :-( - return (c == 10); + return c == 10; } -#endif // wxUSE_STREAMS && wxUSE_PCX +#endif // wxUSE_STREAMS + +#endif // wxUSE_IMAGE && wxUSE_PCX