AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TRUE, not true; FALSE, not false....

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-01-18 16:58:34 +00:00
parent b4b830ec00
commit 19f1a09ac9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/imagiff.cpp
View File

@ -79,8 +79,8 @@ class WXDLLEXPORT wxIFFDecoder
private: private:
IFFImage *m_image; // image data IFFImage *m_image; // image data
wxInputStream *m_f; // input stream wxInputStream *m_f; // input stream
unsigned char *databuf; unsigned char *databuf;
unsigned char *picptr; unsigned char *picptr;
unsigned char *decomp_mem; unsigned char *decomp_mem;
void Destroy(); void Destroy();
@ -376,7 +376,7 @@ int wxIFFDecoder::ReadIFF()
// main decoding loop. searches IFF chunks and handles them. // main decoding loop. searches IFF chunks and handles them.
// terminates when BODY chunk was found or dataptr ran over end of file // terminates when BODY chunk was found or dataptr ran over end of file
// //
bool BMHDok = false, CMAPok = false, CAMGok = false; bool BMHDok = FALSE, CMAPok = FALSE, CAMGok = FALSE;
int bmhd_width = 0, bmhd_height = 0, bmhd_bitplanes = 0, bmhd_transcol = -1; int bmhd_width = 0, bmhd_height = 0, bmhd_bitplanes = 0, bmhd_transcol = -1;
byte bmhd_masking = 0, bmhd_compression = 0; byte bmhd_masking = 0, bmhd_compression = 0;
long camg_viewmode = 0; long camg_viewmode = 0;
@ -406,7 +406,7 @@ int wxIFFDecoder::ReadIFF()
bmhd_masking = *(dataptr + 8 + 9); bmhd_masking = *(dataptr + 8 + 9);
bmhd_compression = *(dataptr + 8 + 10); // get compression bmhd_compression = *(dataptr + 8 + 10); // get compression
bmhd_transcol = iff_getword(dataptr + 8 + 12); bmhd_transcol = iff_getword(dataptr + 8 + 12);
BMHDok = true; // got BMHD BMHDok = TRUE; // got BMHD
dataptr += 8 + chunkLen; // to next chunk dataptr += 8 + chunkLen; // to next chunk
} }
else if (strncmp((char *)dataptr, "CMAP", 4) == 0) { // CMAP ? else if (strncmp((char *)dataptr, "CMAP", 4) == 0) { // CMAP ?
@ -437,14 +437,14 @@ int wxIFFDecoder::ReadIFF()
wxLogTrace(_T("iff"), _T("Read %d colors from IFF file."), wxLogTrace(_T("iff"), _T("Read %d colors from IFF file."),
colors); colors);
CMAPok = true; // got CMAP CMAPok = TRUE; // got CMAP
dataptr += 8 + chunkLen; // to next chunk dataptr += 8 + chunkLen; // to next chunk
} else if (strncmp((char *)dataptr, "CAMG", 4) == 0) { // CAMG ? } else if (strncmp((char *)dataptr, "CAMG", 4) == 0) { // CAMG ?
if (chunkLen < 4 || truncated) { if (chunkLen < 4 || truncated) {
break; break;
} }
camg_viewmode = iff_getlong(dataptr + 8); // get viewmodes camg_viewmode = iff_getlong(dataptr + 8); // get viewmodes
CAMGok = true; // got CAMG CAMGok = TRUE; // got CAMG
dataptr += 8 + chunkLen; // to next chunk dataptr += 8 + chunkLen; // to next chunk
} }
else if (strncmp((char *)dataptr, "BODY", 4) == 0) { // BODY ? else if (strncmp((char *)dataptr, "BODY", 4) == 0) { // BODY ?
@ -727,7 +727,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler)
#if wxUSE_STREAMS #if wxUSE_STREAMS
bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream, bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int WXUNUSED(index)) bool verbose, int WXUNUSED(index))
{ {
wxIFFDecoder *decod; wxIFFDecoder *decod;