Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCX images can now be embedded in streams

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
1999-12-16 18:19:41 +00:00
parent 85806dc2d8
commit 51dba3f868
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/common/imagpcx.cpp
View File

@@ -168,8 +168,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
int nplanes; // number of planes int nplanes; // number of planes
int encoding; // is the image RLE encoded? int encoding; // is the image RLE encoded?
int format; // image format (8 bit, 24 bit) int format; // image format (8 bit, 24 bit)
unsigned int i; unsigned int i, j;
off_t pos;
// Read PCX header and check the version number (it must // Read PCX header and check the version number (it must
// be at least 5 or higher for 8 bit and 24 bit images). // be at least 5 or higher for 8 bit and 24 bit images).
@@ -199,23 +198,19 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
else else
return wxPCX_INVFORMAT; return wxPCX_INVFORMAT;
// If the image is of type wxPCX_8BIT, then there is a // If the image is of type wxPCX_8BIT, then there is
// palette at the end of the file. Read it now before // a palette at the end of the image data. If we were
// proceeding. // working with a file, we could seek at the end to the
// // end (SeekI(-769, wxFromEnd) and read the palette
if (format == wxPCX_8BIT) // before proceeding. Unfortunately, this would prevent
{ // loading several PCXs in a single stream, so we can't
pos = stream.TellI(); // do it. Thus, 8-bit images will have to be decoded in
stream.SeekI(-769, wxFromEnd); // two passes: one to read and decode the image data,
// and another to replace 'colour indexes' with RGB
// values.
if (stream.GetC() != 12)
return wxPCX_INVFORMAT;
stream.Read(pal, 768); // Resize the image and allocate memory for a scanline.
stream.SeekI(pos, wxFromStart);
}
// Allocate memory for a scanline and resize the image.
// //
image->Create(width, height); image->Create(width, height);
@@ -230,7 +225,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
// //
dst = image->GetData(); dst = image->GetData();
for (; height; height--) for (j = height; j; j--)
{ {
if (encoding) if (encoding)
RLEdecode(p, bytesperline * nplanes, stream); RLEdecode(p, bytesperline * nplanes, stream);
@@ -243,9 +238,9 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
{ {
for (i = 0; i < width; i++) for (i = 0; i < width; i++)
{ {
*(dst++) = pal[ 3 * (p[i]) ]; // first pass, just store the colour index
*(dst++) = pal[ 3 * (p[i]) + 1]; *dst = p[i];
*(dst++) = pal[ 3 * (p[i]) + 2]; dst += 3;
} }
break; break;
} }
@@ -264,6 +259,28 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
free(p); free(p);
// 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;
if (stream.GetC() != 12)
return wxPCX_INVFORMAT;
stream.Read(pal, 768);
p = image->GetData();
for (unsigned long k = height * width; k; k--)
{
index = *p;
*(p++) = pal[3 * index];
*(p++) = pal[3 * index + 1];
*(p++) = pal[3 * index + 2];
}
}
return wxPCX_OK; return wxPCX_OK;
} }