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

Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles

Browse Source 
clean with this compiler. Hopefully I did this without breaking other
compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kendall Bennett
2001-05-02 19:48:15 +00:00
parent b1d1dc510d
commit 33ac7e6f01
93 changed files with 739 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/imagpcx.cpp
View File

@@ -102,7 +102,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
//
if ((data & 0xC0) != 0xC0)
{
*(p++) = data;
*(p++) = (unsigned char)data;
size--;
}
else
@@ -110,7 +110,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
cont = data & 0x3F;
data = (unsigned char)s.GetC();
for (i = 1; i <= cont; i++)
*(p++) = data;
*(p++) = (unsigned char)data;
size -= cont;
}
}
@@ -349,12 +349,12 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
hdr[HDR_ENCODING] = 1;
hdr[HDR_NPLANES] = nplanes;
hdr[HDR_BITSPERPIXEL] = 8;
hdr[HDR_BYTESPERLINE] = bytesperline % 256;
hdr[HDR_BYTESPERLINE + 1] = bytesperline / 256;
hdr[HDR_XMAX] = (width - 1) % 256;
hdr[HDR_XMAX + 1] = (width - 1) / 256;
hdr[HDR_YMAX] = (height - 1) % 256;
hdr[HDR_YMAX + 1] = (height - 1) / 256;
hdr[HDR_BYTESPERLINE] = (unsigned char)(bytesperline % 256);
hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256);
hdr[HDR_XMAX] = (unsigned char)((width - 1) % 256);
hdr[HDR_XMAX + 1] = (unsigned char)((width - 1) / 256);
hdr[HDR_YMAX] = (unsigned char)((height - 1) % 256);
hdr[HDR_YMAX + 1] = (unsigned char)((height - 1) / 256);
hdr[HDR_PALETTEINFO] = 1;
stream.Write(hdr, 128);