// For memcpy
#include <string.h>
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_ICO_CUR
+
+static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType);
+
+#endif // wxUSE_ICO_CUR
+
//-----------------------------------------------------------------------------
// wxBMPHandler
//-----------------------------------------------------------------------------
{
wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") );
- if ( !image->Ok() )
+ if ( !image->IsOk() )
{
if ( verbose )
{
}
unsigned width = image->GetWidth();
- unsigned row_padding = (4 - int(width*bpp/8.0) % 4) % 4; // # bytes to pad to dword
- unsigned row_width = int(width * bpp/8.0) + row_padding; // # of bytes per row
+ unsigned row_padding = (4 - ((width * bpp + 7) / 8) % 4) % 4; // # bytes to pad to dword
+ unsigned row_width = (width * bpp + 7) / 8 + row_padding; // # of bytes per row
struct
{
// pointer to the image data, use quantized if available
wxUint8 *data = (wxUint8*) image->GetData();
- if (q_image) if (q_image->Ok()) data = (wxUint8*) q_image->GetData();
+ if (q_image) if (q_image->IsOk()) data = (wxUint8*) q_image->GetData();
wxUint8 *buffer = new wxUint8[row_width];
memset(buffer, 0, row_width);
wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);
+ bool isUpsideDown = true;
+
+ if (height < 0)
+ {
+ isUpsideDown = false;
+ height = -height;
+ }
+
// destroy existing here instead of:
image->Destroy();
image->Create(width, height);
{
if ( comp == BI_BITFIELDS )
{
- int bit = 0;
+ int bit;
stream.Read(dbuf, 4 * 3);
rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
{
// NOTE: seeking a positive amount in wxFromCurrent mode allows us to
// load even non-seekable streams (see wxInputStream::SeekI docs)!
- if (stream.SeekI(bmpOffset, wxFromCurrent) == wxInvalidOffset)
- return false;
+ const wxFileOffset pos = stream.TellI();
+ if (pos != wxInvalidOffset && bmpOffset > pos)
+ if (stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset)
+ return false;
//else: icon, just carry on
}
int linesize = ((width * bpp + 31) / 32) * 4;
- /* BMPs are stored upside down */
- for ( int line = (height - 1); line >= 0; line-- )
+ // flag indicating if we have any not fully transparent alpha values: this
+ // is used to account for the bitmaps which use 32bpp format (normally
+ // meaning that they have alpha channel) but have only zeroes in it so that
+ // without this hack they appear fully transparent -- and as this is
+ // unlikely intentional, we consider that they don't have alpha at all in
+ // this case (see #10915)
+ bool hasValidAlpha = false;
+
+ for ( int row = 0; row < height; row++ )
{
+ int line = isUpsideDown ? height - 1 - row : row;
+
int linepos = 0;
for ( int column = 0; column < width ; )
{
{
if ( aByte == 0 )
{
- if ( column > 0 )
- column = width;
+ // end of scanline marker
+ column = width;
+ row--;
}
else if ( aByte == 1 )
{
+ // end of RLE data marker, stop decoding
column = width;
- line = -1;
+ row = height;
}
else if ( aByte == 2 )
{
+ // delta marker, move in image
aByte = stream.GetC();
column += aByte;
linepos = column * bpp / 4;
aByte = stream.GetC();
- line -= aByte; // upside down
+ row += aByte; // upside down
}
else
{
{
for (int nibble = 0; nibble < 2 && column < width; nibble++)
{
- int index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
+ int index = ((aByte & (0xF0 >> (nibble * 4))) >> (!nibble * 4));
if ( index >= 16 )
index = 15;
ptr[poffset] = cmap[index].r;
{
if ( aByte == 0 )
{
- /* column = width; */
+ // end of scanline marker
+ column = width;
+ row--;
}
else if ( aByte == 1 )
{
+ // end of RLE data marker, stop decoding
column = width;
- line = -1;
+ row = height;
}
else if ( aByte == 2 )
{
+ // delta marker, move in image
aByte = stream.GetC();
column += aByte;
linepos = column * bpp / 8;
aByte = stream.GetC();
- line += aByte;
+ row -= aByte;
}
else
{
stream.Read(&aWord, 2);
aWord = wxUINT16_SWAP_ON_BE(aWord);
linepos += 2;
- /* use the masks and calculated amonut of shift
+ /* Use the masks and calculated amount of shift
to retrieve the color data out of the word. Then
shift it left by (8 - number of bits) such that
the image has the proper dynamic range */
- temp = (unsigned char)((aWord & rmask) >> rshift << (8-rbits));
+ temp = (unsigned char)(((aWord & rmask) >> rshift) << (8-rbits));
ptr[poffset] = temp;
- temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits));
+ temp = (unsigned char)(((aWord & gmask) >> gshift) << (8-gbits));
ptr[poffset + 1] = temp;
- temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits));
+ temp = (unsigned char)(((aWord & bmask) >> bshift) << (8-bbits));
ptr[poffset + 2] = temp;
column++;
}
{
temp = (unsigned char)((aDword & amask) >> ashift);
alpha[line * width + column] = temp;
+
+ if ( temp != wxALPHA_TRANSPARENT )
+ hasValidAlpha = true;
}
column++;
}
image->SetMask(false);
+ // check if we had any valid alpha values in this bitmap
+ if ( alpha && !hasValidAlpha )
+ {
+ // we didn't, so finally discard the alpha channel completely
+ image->ClearAlpha();
+ }
+
const wxStreamError err = stream.GetLastError();
return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
}
// wxCountingOutputStream::IsOk() always returns true for now and this
// "if" provokes VC++ warnings in optimized build
#if 0
- if ( !cStream.Ok() )
+ if ( !cStream.IsOk() )
{
if ( verbose )
{
bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int index)
{
+ if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
+ {
+ return false;
+ }
+
return DoLoadFile(image, stream, verbose, index);
}
stream.Read(&IconDir, sizeof(IconDir));
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
-
+
// nType is 1 for Icons, 2 for Cursors:
wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
// remember how many bytes we read from the stream:
wxFileOffset alreadySeeked = sizeof(IconDir);
-
+
for (unsigned int i = 0; i < nIcons; i++ )
{
alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
-
+
// bHeight and bColorCount are wxUint8
if ( pCurrentEntry->bWidth >= wMax )
{
colmax = pCurrentEntry->bColorCount;
}
}
-
+
pCurrentEntry++;
}
{
// seek to selected icon:
pCurrentEntry = pIconDirEntry + iSel;
-
+
// NOTE: seeking a positive amount in wxFromCurrent mode allows us to
// load even non-seekable streams (see wxInputStream::SeekI docs)!
wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
return false;
-
+
bResult = LoadDib(image, stream, true, IsBmp);
bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
if ( bResult && bIsCursorType && nType == 2 )
image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
}
}
-
+
delete [] pIconDirEntry;
-
+
return bResult;
}
int wxICOHandler::DoGetImageCount(wxInputStream& stream)
{
+ // It's ok to modify the stream position in this function.
+
+ if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
+ {
+ return 0;
+ }
+
ICONDIR IconDir;
if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
- // it's ok to modify the stream position here
return 0;
-
+
return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);
}
bool wxICOHandler::DoCanRead(wxInputStream& stream)
{
- unsigned char hdr[4];
- if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here
- return false;
+ return CanReadICOOrCUR(&stream, 1 /*for identifying an icon*/);
- // hdr[2] is one for an icon and two for a cursor
- return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
}
#endif // wxUSE_STREAMS
bool wxCURHandler::DoCanRead(wxInputStream& stream)
{
- unsigned char hdr[4];
- if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) // it's ok to modify the stream position here
- return false;
-
- // hdr[2] is one for an icon and two for a cursor
- return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
+ return CanReadICOOrCUR(&stream, 2 /*for identifying a cursor*/);
}
#endif // wxUSE_STREAMS
return decoder.GetFrameCount();
}
+static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType)
+{
+ // It's ok to modify the stream position in this function.
+
+ if ( stream->IsSeekable() && stream->SeekI(0) == wxInvalidOffset )
+ {
+ return false;
+ }
+
+ ICONDIR iconDir;
+ if ( !stream->Read(&iconDir, sizeof(iconDir)) )
+ {
+ return false;
+ }
+
+ return !iconDir.idReserved // reserved, must be 0
+ && wxUINT16_SWAP_ON_BE(iconDir.idType) == resourceType // either 1 or 2
+ && iconDir.idCount; // must contain at least one image
+}
+
#endif // wxUSE_STREAMS
#endif // wxUSE_ICO_CUR
projects / wxWidgets.git / blobdiff