#include "wx/bitmap.h"
#include "wx/palette.h"
#include "wx/intl.h"
+ #include "wx/math.h"
#endif
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/quantize.h"
+#include "wx/scopeguard.h"
#include "wx/anidecod.h"
// For memcpy
#include <string.h>
-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
//-----------------------------------------------------------------------------
// wxBMPHandler
//-----------------------------------------------------------------------------
wxUint16 bpp; // bits per pixel
wxUint32 compression; // compression method
wxUint32 size_of_bmp; // size of the bitmap
- wxUint32 h_res, v_res; // image resolution in dpi
+ wxUint32 h_res, v_res; // image resolution in pixels-per-meter
wxUint32 num_clrs; // number of colors used
wxUint32 num_signif_clrs;// number of significant colors
} hdr;
hdr.bpp = wxUINT16_SWAP_ON_BE(bpp);
hdr.compression = 0; // RGB uncompressed
hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight());
- hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72); // 72dpi is standard
+
+ // get the resolution from the image options or fall back to 72dpi standard
+ // for the BMP format if not specified
+ int hres, vres;
+ switch ( GetResolutionFromOptions(*image, &hres, &vres) )
+ {
+ default:
+ wxFAIL_MSG( _T("unexpected image resolution units") );
+ // fall through
+
+ case wxIMAGE_RESOLUTION_NONE:
+ hres =
+ vres = 72;
+ // fall through to convert it to correct units
+
+ case wxIMAGE_RESOLUTION_INCHES:
+ // convert resolution in inches to resolution in centimeters
+ hres = (int)(10*mm2inches*hres);
+ vres = (int)(10*mm2inches*vres);
+ // fall through to convert it to resolution in meters
+
+ case wxIMAGE_RESOLUTION_CM:
+ // convert resolution in centimeters to resolution in meters
+ hres *= 100;
+ vres *= 100;
+ break;
+ }
+
+ hdr.h_res = wxUINT32_SWAP_ON_BE(hres);
+ hdr.v_res = wxUINT32_SWAP_ON_BE(vres);
hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
hdr.num_signif_clrs = 0; // all colors are significant
}
-typedef struct
+struct BMPPalette
{
+ static void Free(BMPPalette* pal) { delete [] pal; }
+
unsigned char r, g, b;
-} _cmap;
+};
bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
int bpp, int ncolors, int comp,
wxFileOffset bmpOffset, wxInputStream& stream,
bool verbose, bool IsBmp, bool hasPalette)
{
- wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0;
- int rshift = 0, gshift = 0, bshift = 0;
+ wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0;
+ int rshift = 0, gshift = 0, bshift = 0, ashift = 0;
int rbits = 0, gbits = 0, bbits = 0;
wxInt32 dbuf[4];
wxInt8 bbuf[4];
wxUint16 aWord;
// allocate space for palette if needed:
- _cmap *cmap;
+ BMPPalette *cmap;
if ( bpp < 16 )
{
- cmap = new _cmap[ncolors];
+ cmap = new BMPPalette[ncolors];
if ( !cmap )
{
if (verbose)
return false;
}
}
- else
+ else // no palette
+ {
cmap = NULL;
+ }
+
+ wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);
// destroy existing here instead of:
image->Destroy();
{
if ( verbose )
wxLogError( _("BMP: Couldn't allocate memory.") );
- if ( cmap )
- delete[] cmap;
return false;
}
+ unsigned char *alpha;
+ if ( bpp == 32 )
+ {
+ // tell the image to allocate an alpha buffer
+ image->SetAlpha();
+ alpha = image->GetAlpha();
+ if ( !alpha )
+ {
+ if ( verbose )
+ wxLogError(_("BMP: Couldn't allocate memory."));
+ return false;
+ }
+ }
+ else // no alpha
+ {
+ alpha = NULL;
+ }
+
// Reading the palette, if it exists:
if ( bpp < 16 && ncolors != 0 )
{
rmask = 0x00FF0000;
gmask = 0x0000FF00;
bmask = 0x000000FF;
+ amask = 0xFF000000;
+
+ ashift = 24;
rshift = 16;
gshift = 8;
bshift = 0;
* Reading the image data
*/
if ( IsBmp )
- stream.SeekI(bmpOffset); // else icon, just carry on
+ {
+ if (stream.SeekI(bmpOffset) == wxInvalidOffset)
+ return false;
+ //else: icon, just carry on
+ }
unsigned char *data = ptr;
ptr[poffset + 1] = temp;
temp = (unsigned char)((aDword & bmask) >> bshift);
ptr[poffset + 2] = temp;
+ if ( alpha )
+ {
+ temp = (unsigned char)((aDword & amask) >> ashift);
+ alpha[line * width + column] = temp;
+ }
column++;
}
}
}
}
- delete[] cmap;
-
image->SetMask(false);
const wxStreamError err = stream.GetLastError();
}
stream.Read(dbuf, 4 * 2);
+
int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );
if (ncolors == 0)
ncolors = 1 << bpp;
}
+ // the resolution in the bitmap header is in meters, convert to centimeters
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, wxIMAGE_RESOLUTION_CM);
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, dbuf[2]/100);
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, dbuf[3]/100);
+
return true;
}
bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int index)
{
- stream.SeekI(0);
+ if (stream.SeekI(0) == wxInvalidOffset)
+ return false;
return DoLoadFile(image, stream, verbose, index);
}
{
// seek to selected icon:
pCurrentEntry = pIconDirEntry + iSel;
- stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);
+ if (stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart) == 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 )
{
ICONDIR IconDir;
wxFileOffset iPos = stream.TellI();
- stream.SeekI(0);
- stream.Read(&IconDir, sizeof(IconDir));
+ if (stream.SeekI(0) == wxInvalidOffset)
+ return 0;
+ if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
+ return 0;
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
- stream.SeekI(iPos);
+ if (stream.SeekI(iPos) == wxInvalidOffset)
+ return 0;
return (int)nIcons;
}
bool wxICOHandler::DoCanRead(wxInputStream& stream)
{
- stream.SeekI(0);
+ if (stream.SeekI(0) == wxInvalidOffset)
+ return false;
unsigned char hdr[4];
if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
return false;
bool wxCURHandler::DoCanRead(wxInputStream& stream)
{
- stream.SeekI(0);
+ if (stream.SeekI(0) == wxInvalidOffset)
+ return false;
unsigned char hdr[4];
if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
return false;
projects / wxWidgets.git / blobdiff