bool wxBMPHandler::SaveFile(wxImage *image,
wxOutputStream& stream,
bool verbose)
-{
+{
return SaveDib(image, stream, verbose, TRUE/*IsBmp*/, FALSE/*IsMask*/);
}
if ( !image->Ok() )
{
- if ( verbose )
+ if ( verbose )
wxLogError(_("BMP: Couldn't save invalid image."));
return FALSE;
}
// get the format of the BMP file to save, else use 24bpp
unsigned format = wxBMP_24BPP;
- if ( image->HasOption(wxBMP_FORMAT) )
- format = image->GetOptionInt(wxBMP_FORMAT);
+ if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
+ format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);
- unsigned bpp; // # of bits per pixel
+ wxUint16 bpp; // # of bits per pixel
int palette_size; // # of color map entries, ie. 2^bpp colors
// set the bpp and appropriate palette_size, and do additional checks
hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72); // 72dpi is standard
hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
hdr.num_signif_clrs = 0; // all colors are significant
-
+
if ( IsBmp )
{
if (// VS: looks ugly but compilers tend to do ugly things with structs,
!stream.Write(&hdr.magic, 2) ||
!stream.Write(&hdr.filesize, 4) ||
!stream.Write(&hdr.reserved, 4) ||
- !stream.Write(&hdr.data_offset, 4)
+ !stream.Write(&hdr.data_offset, 4)
)
{
if (verbose)
unsigned char r, g, b;
} _cmap;
-bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
+bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
int bpp, int ncolors, int comp,
off_t bmpOffset, wxInputStream& stream,
bool verbose, bool IsBmp, bool hasPalette)
// destroy existing here instead of:
image->Destroy();
image->Create(width, height);
-
+
unsigned char *ptr = image->GetData();
if ( !ptr )
return stream.IsOk();
}
-bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
+bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
bool verbose, bool IsBmp)
{
wxUint16 aWord;
int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]);
if ( !IsBmp)height = height / 2; // for icons divide by 2
-
+
if ( width > 32767 )
{
if (verbose)
stream.Read(dbuf, 4 * 4);
int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
- if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
+ if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
comp != BI_BITFIELDS )
{
if (verbose)
return TRUE;
}
-bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
+bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int WXUNUSED(index))
{
// Read a single DIB fom the file:
int images = 1; // only generate one image
- // VS: This is a hack of sort - since ICO and CUR files are almost
+ // VS: This is a hack of sort - since ICO and CUR files are almost
// identical, we have all the meat in wxICOHandler and check for
// the actual (handler) type when the code has to distinguish between
// the two formats
wxImage mask;
if ( image->HasMask() )
- {
+ {
// make another image with black/white:
mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
{
for (j = 0; j < mask.GetHeight(); j++)
{
- if ((r == mask.GetRed(i, j)) &&
- (g == mask.GetGreen(i, j))&&
+ if ((r == mask.GetRed(i, j)) &&
+ (g == mask.GetGreen(i, j))&&
(b == mask.GetBlue(i, j)) )
image->SetRGB(i, j, 0, 0, 0 );
}
}
// Set the formats for image and mask
// (Windows never saves with more than 8 colors):
- image->SetOption(wxBMP_FORMAT, wxBMP_8BPP);
+ image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);
// monochome bitmap:
- mask.SetOption(wxBMP_FORMAT, wxBMP_1BPP_BW);
+ mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
bool IsBmp = FALSE;
bool IsMask = FALSE;
icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
if ( type == 2 /*CUR*/)
{
- int hx = image->HasOption(wxCUR_HOTSPOT_X) ?
- image->GetOptionInt(wxCUR_HOTSPOT_X) :
+ int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
+ image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :
image->GetWidth() / 2;
- int hy = image->HasOption(wxCUR_HOTSPOT_Y) ?
- image->GetOptionInt(wxCUR_HOTSPOT_Y) :
+ int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
+ image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :
image->GetHeight() / 2;
// actually write the values of the hot spot here:
return TRUE;
}
-bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
+bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int index)
{
stream.SeekI(0);
return DoLoadFile(image, stream, verbose, index);
}
-bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
- bool verbose, int index)
+bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
+ bool WXUNUSED(verbose), int index)
{
bool bResult = FALSE;
bool IsBmp = FALSE;
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
// nType is 1 for Icons, 2 for Cursors:
wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
-
+
// loop round the icons and choose the best one:
ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
ICONDIRENTRY *pCurrentEntry = pIconDirEntry;
if ( pCurrentEntry->bColorCount == 0 )
pCurrentEntry->bColorCount = 255;
if ( pCurrentEntry->bColorCount >= colmax )
- {
+ {
iSel = i;
wMax = pCurrentEntry->bWidth;
colmax = pCurrentEntry->bColorCount;
}
pCurrentEntry++;
}
-
+
if ( index != -1 )
{
// VS: Note that we *have* to run the loop above even if index != -1, because
// it reads ICONDIRENTRies.
iSel = index;
}
-
+
if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
{
wxLogError(_("ICO: Invalid icon index."));
if ( bResult && bIsCursorType && nType == 2 )
{
// it is a cursor, so let's set the hotspot:
- image->SetOption(wxCUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
- image->SetOption(wxCUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
+ image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
+ image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
}
}
delete[] pIconDirEntry;
IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
-bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
+bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int index)
{
- wxInt32 FCC1, FCC2;
- wxUint32 datalen;
+ wxInt32 FCC1, FCC2;
+ wxUint32 datalen;
static const char *rifftxt = "RIFF";
static const char *listtxt = "LIST";
static const char *icotxt = "icon";
wxInt32 *ico32 = (wxInt32 *) icotxt;
int iIcon = 0;
-
+
stream.SeekI(0);
stream.Read(&FCC1, 4);
- if ( FCC1 != *riff32 )
+ if ( FCC1 != *riff32 )
return FALSE;
// we have a riff file:
while (stream.IsOk())
- {
+ {
// we always have a data size
stream.Read(&datalen, 4);
-
+ datalen = wxINT32_SWAP_ON_BE(datalen) ;
//now either data or a FCC
if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
}
- else
+ else
{
if (FCC1 == *ico32 && iIcon >= index)
{
return DoLoadFile(image, stream, verbose, -1);
- }
+ }
else
{
stream.SeekI(stream.TellI() + datalen);
iIcon ++;
}
}
-
+
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
bool wxANIHandler::DoCanRead(wxInputStream& stream)
{
- wxInt32 FCC1, FCC2;
- wxUint32 datalen ;
+ wxInt32 FCC1, FCC2;
+ wxUint32 datalen ;
static const char *rifftxt = "RIFF";
static const char *listtxt = "LIST";
static const char *anihtxt = "anih";
wxInt32 *riff32 = (wxInt32 *) rifftxt;
wxInt32 *list32 = (wxInt32 *) listtxt;
wxInt32 *anih32 = (wxInt32 *) anihtxt;
-
+
stream.SeekI(0);
stream.Read(&FCC1, 4);
- if ( FCC1 != *riff32 )
+ if ( FCC1 != *riff32 )
return FALSE;
// we have a riff file:
while ( stream.IsOk() )
{
- if ( FCC1 != *anih32 )
- return TRUE;
+ if ( FCC1 == *anih32 )
+ return TRUE;
// we always have a data size:
stream.Read(&datalen, 4);
-
+ datalen = wxINT32_SWAP_ON_BE(datalen) ;
// now either data or a FCC:
- if ( (FCC1 == *riff32) || (FCC1 == *list32) )
+ if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
}
- else
+ else
{
stream.SeekI(stream.TellI() + datalen);
}
-
+
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
int wxANIHandler::GetImageCount(wxInputStream& stream)
{
- wxInt32 FCC1, FCC2;
- wxUint32 datalen ;
+ wxInt32 FCC1, FCC2;
+ wxUint32 datalen ;
static const char *rifftxt = "RIFF";
static const char *listtxt = "LIST";
static const char *anihtxt = "anih";
wxInt32 *riff32 = (wxInt32 *) rifftxt;
wxInt32 *list32 = (wxInt32 *) listtxt;
wxInt32 *anih32 = (wxInt32 *) anihtxt;
-
+
stream.SeekI(0);
stream.Read(&FCC1, 4);
if ( FCC1 != *riff32 )
{
// we always have a data size:
stream.Read(&datalen, 4);
-
+ datalen = wxINT32_SWAP_ON_BE(datalen) ;
// now either data or a FCC:
- if ( (FCC1 == *riff32) || (FCC1 == *list32) )
+ if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
}
{
wxUint32 *pData = new wxUint32[datalen/4];
stream.Read(pData, datalen);
- int nIcons = *(pData + 1);
+ int nIcons = wxINT32_SWAP_ON_BE(*(pData + 1));
delete[] pData;
return nIcons;
}
- else
+ else
stream.SeekI(stream.TellI() + datalen);
}
-
+
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
projects / wxWidgets.git / blobdiff