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

Fixed deprecated usage warnings in wxPNGHandler.

Browse Source 
Since upgrading to a newer libpng its structure members are marked as deprecated (probably as a way to discourage their direct usage). Replaced accessing them by using function calls instead.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-01-04 13:06:45 +00:00
parent 65918917b1
commit 1de255d613
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/imagpng.cpp
View File

@@ -579,19 +579,23 @@ wxPNGHandler::LoadFile(wxImage *image,
#if wxUSE_PALETTE #if wxUSE_PALETTE
if (color_type == PNG_COLOR_TYPE_PALETTE) if (color_type == PNG_COLOR_TYPE_PALETTE)
{ {
const size_t ncolors = info_ptr->num_palette; png_colorp palette = NULL;
unsigned char* r = new unsigned char[ncolors]; int numPalette = 0;
unsigned char* g = new unsigned char[ncolors];
unsigned char* b = new unsigned char[ncolors];
for (size_t j = 0; j < ncolors; j++) (void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette);
unsigned char* r = new unsigned char[numPalette];
unsigned char* g = new unsigned char[numPalette];
unsigned char* b = new unsigned char[numPalette];
for (int j = 0; j < numPalette; j++)
{ {
r[j] = info_ptr->palette[j].red; r[j] = palette[j].red;
g[j] = info_ptr->palette[j].green; g[j] = palette[j].green;
b[j] = info_ptr->palette[j].blue; b[j] = palette[j].blue;
} }
image->SetPalette(wxPalette(ncolors, r, g, b)); image->SetPalette(wxPalette(numPalette, r, g, b));
delete[] r; delete[] r;
delete[] g; delete[] g;
delete[] b; delete[] b;
@@ -824,11 +828,14 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
PNG_FILTER_TYPE_BASE); PNG_FILTER_TYPE_BASE);
#if wxUSE_PALETTE #if wxUSE_PALETTE
png_colorp palette = NULL;
int numPalette = 0;
if (bUsePalette) if (bUsePalette)
{ {
const wxPalette& pal = image->GetPalette(); const wxPalette& pal = image->GetPalette();
const int palCount = pal.GetColoursCount(); const int palCount = pal.GetColoursCount();
png_colorp palette = (png_colorp) malloc( palette = (png_colorp) malloc(
(palCount + 1 /*headroom for trans */) * sizeof(png_color)); (palCount + 1 /*headroom for trans */) * sizeof(png_color));
if (!palette) if (!palette)
@@ -847,7 +854,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
pal.GetRGB(i, &palette[i].red, &palette[i].green, &palette[i].blue); pal.GetRGB(i, &palette[i].red, &palette[i].green, &palette[i].blue);
} }
png_uint_16 numPalette = palCount; numPalette = palCount;
if (bHasMask) if (bHasMask)
{ {
int index = PaletteFind(mask, palette, numPalette); int index = PaletteFind(mask, palette, numPalette);
@@ -870,6 +877,10 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
png_set_PLTE(png_ptr, info_ptr, palette, numPalette); png_set_PLTE(png_ptr, info_ptr, palette, numPalette);
free (palette); free (palette);
palette = NULL;
// Let palette point to libpng's copy of the palette.
(void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette);
} }
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
@@ -996,7 +1007,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
case wxPNG_TYPE_PALETTE: case wxPNG_TYPE_PALETTE:
*pData++ = (unsigned char) PaletteFind(clr, *pData++ = (unsigned char) PaletteFind(clr,
info_ptr->palette, info_ptr->num_palette); palette, numPalette);
break; break;
} }