X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..222594ead7a8ed85cb0c709850b2eed07fc3ac86:/src/msw/pnghand.cpp diff --git a/src/msw/pnghand.cpp b/src/msw/pnghand.cpp index 2f82fa3e10..833dd0a0f2 100644 --- a/src/msw/pnghand.cpp +++ b/src/msw/pnghand.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -26,22 +26,20 @@ #include #if wxUSE_IOSTREAMH -#include +# include #else -#include -# ifdef _MSC_VER - using namespace std; -# endif +# include #endif #include -#include -#include -#include -#include +#include "wx/palette.h" +#include "wx/bitmap.h" +#include "wx/utils.h" +#include "wx/msw/pngread.h" +#include "wx/msw/dibutils.h" extern "C" { -#include "png.h" +#include "../png/png.h" } extern "C" void png_read_init PNGARG((png_structp png_ptr)); @@ -70,25 +68,25 @@ ima_png_error(png_struct *png_ptr, char *message) { // wxMessageBox(message, "PNG error"); - longjmp(png_ptr->jmpbuf, 1); + longjmp(png_ptr->jmpbuf, 1); } // static wxGifReaderIter* iter; wxPalette *wxCopyPalette(const wxPalette *cmap); -wxPNGReader::wxPNGReader(void) +wxPNGReader::wxPNGReader() { filetype = 0; - RawImage = NULL; // Image data + RawImage = NULL; // Image data - Width = 0; Height = 0; // Dimensions - Depth = 0; // (bits x pixel) - ColorType = 0; // Bit 1 = Palette used - // Bit 2 = Color used - // Bit 3 = Alpha used + Width = 0; Height = 0; // Dimensions + Depth = 0; // (bits x pixel) + ColorType = 0; // Bit 1 = Palette used + // Bit 2 = Color used + // Bit 3 = Alpha used - EfeWidth = 0; // Efective Width + EfeWidth = 0; // Efective Width lpbi = NULL; bgindex = -1; @@ -96,19 +94,19 @@ wxPNGReader::wxPNGReader(void) imageOK = FALSE; } -wxPNGReader::wxPNGReader ( char* ImageFileName ) +wxPNGReader::wxPNGReader ( wxChar* ImageFileName ) { imageOK = FALSE; filetype = 0; - RawImage = NULL; // Image data + RawImage = NULL; // Image data - Width = 0; Height = 0; // Dimensions - Depth = 0; // (bits x pixel) - ColorType = 0; // Bit 1 = Palette used - // Bit 2 = Color used - // Bit 3 = Alpha used + Width = 0; Height = 0; // Dimensions + Depth = 0; // (bits x pixel) + ColorType = 0; // Bit 1 = Palette used + // Bit 2 = Color used + // Bit 3 = Alpha used - EfeWidth = 0; // Efective Width + EfeWidth = 0; // Efective Width lpbi = NULL; bgindex = -1; @@ -125,17 +123,18 @@ wxPNGReader::Create(int width, int height, int depth, int colortype) if (lpbi) { #ifdef __WIN16__ - GlobalFreePtr((unsigned int) lpbi); + GlobalFreePtr((unsigned int) lpbi); #else - GlobalFreePtr(lpbi); + GlobalFreePtr(lpbi); #endif -// delete Palette; +// delete Palette; } RawImage = 0; Palette = 0; - if (lpbi = DibCreate(Depth, Width, Height)) { - RawImage = (ImagePointerType)DibPtr(lpbi); - EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4; + lpbi = wxDibCreate(Depth, Width, Height); + if (lpbi) { + RawImage = (ImagePointerType)wxDibPtr(lpbi); + EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4; imageOK = TRUE; } } @@ -144,11 +143,11 @@ wxPNGReader::~wxPNGReader ( ) { if (lpbi) { #ifdef __WIN16__ - GlobalFreePtr((unsigned int) lpbi); + GlobalFreePtr((unsigned int) lpbi); #else - GlobalFreePtr(lpbi); + GlobalFreePtr(lpbi); #endif - delete Palette; + delete Palette; } } @@ -167,17 +166,17 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b) if (!Inside(x, y)) return FALSE; if (Palette) { - return Palette->GetRGB(GetIndex(x, y), r, g, b); -/* PALETTEENTRY entry; - ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry); - *r = entry.peRed; - *g = entry.peGreen; - *b = entry.peBlue; */ + return Palette->GetRGB(GetIndex(x, y), r, g, b); +/* PALETTEENTRY entry; + ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry); + *r = entry.peRed; + *g = entry.peGreen; + *b = entry.peBlue; */ } else { - ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3); - *b = ImagePointer[0]; - *g = ImagePointer[1]; - *r = ImagePointer[2]; + ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3); + *b = ImagePointer[0]; + *g = ImagePointer[1]; + *r = ImagePointer[2]; } return TRUE; } @@ -199,14 +198,14 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b) if (ColorType & COLORTYPE_PALETTE) { - if (!Palette) return FALSE; - SetIndex(x, y, Palette->GetPixel(r, g, b)); + if (!Palette) return FALSE; + SetIndex(x, y, Palette->GetPixel(r, g, b)); } else { - ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3); - ImagePointer[0] = b; - ImagePointer[1] = g; - ImagePointer[2] = r; + ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3); + ImagePointer[0] = b; + ImagePointer[1] = g; + ImagePointer[2] = r; } return TRUE; @@ -215,10 +214,10 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b) bool wxPNGReader::SetPalette(wxPalette* colourmap) { if (!colourmap) - return FALSE; + return FALSE; ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); Palette = colourmap; - return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); + return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } bool @@ -226,13 +225,13 @@ wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b) { Palette = new wxPalette(); if (!Palette) - return FALSE; + return FALSE; if (!g) g = r; if (!b) b = g; Palette->Create(n, r, g, b); ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); - return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); + return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } bool @@ -240,15 +239,15 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct) { Palette = new wxPalette(); if (!Palette) - return FALSE; + return FALSE; byte r[256], g[256], b[256]; for(int i=0; iCreate(n, r, g, b); ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); - return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); + return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } void wxPNGReader::NullData() @@ -267,7 +266,7 @@ void wxPNGReader::NullData() Palette = NULL; } -wxBitmap* wxPNGReader::GetBitmap(void) +wxBitmap* wxPNGReader::GetBitmap() { wxBitmap *bitmap = new wxBitmap; if ( InstantiateBitmap(bitmap) ) @@ -281,10 +280,10 @@ wxBitmap* wxPNGReader::GetBitmap(void) bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) { - HDC dc = ::CreateCompatibleDC(NULL); + HDC dc = ::CreateCompatibleDC(NULL); - if (dc) - { + if (dc) + { // tmpBitmap is a dummy, to satisfy ::CreateCompatibleDC (it // is a memory dc that must have a bitmap selected into it) HDC dc2 = GetDC(NULL); @@ -294,12 +293,12 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) if ( Palette ) { - HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE); - ::RealizePalette(dc); + ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE); + ::RealizePalette(dc); } - HBITMAP hBitmap = ::CreateDIBitmap(dc, lpbi, - CBM_INIT, RawImage, (LPBITMAPINFO) lpbi, DIB_PAL_COLORS); + HBITMAP hBitmap = ::CreateDIBitmap(dc, lpbi, + CBM_INIT, RawImage, (LPBITMAPINFO) lpbi, DIB_PAL_COLORS); ::SelectPalette(dc, NULL, TRUE); ::SelectObject(dc, oldBitmap); @@ -323,16 +322,16 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) wxMask *mask = CreateMask(); bitmap->SetMask(mask); } - return TRUE; + return TRUE; } else { return FALSE; } - } - else + } + else { - return FALSE; + return FALSE; } } @@ -341,13 +340,13 @@ wxPalette *wxCopyPalette(const wxPalette *cmap) // To get number of entries... WORD count = 0; ::GetObject((HPALETTE) cmap->GetHPALETTE(), sizeof(WORD), &count); - + LOGPALETTE* logPal = (LOGPALETTE*) - new BYTE[sizeof(LOGPALETTE) + count*sizeof(PALETTEENTRY)]; + new BYTE[sizeof(LOGPALETTE) + count*sizeof(PALETTEENTRY)]; logPal->palVersion = 0x300; logPal->palNumEntries = count; ::GetPaletteEntries((HPALETTE) cmap->GetHPALETTE(), 0, count, logPal->palPalEntry); - + HPALETTE hPalette = ::CreatePalette(logPal); delete[] logPal; @@ -356,11 +355,11 @@ wxPalette *wxCopyPalette(const wxPalette *cmap) return newCmap; } -wxMask *wxPNGReader::CreateMask(void) +wxMask *wxPNGReader::CreateMask() { HBITMAP hBitmap = ::CreateBitmap(GetWidth(), GetHeight(), 1, 1, NULL); - HDC dc = ::CreateCompatibleDC(NULL); + HDC dc = ::CreateCompatibleDC(NULL); HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, hBitmap); int bgIndex = GetBGIndex(); @@ -377,7 +376,7 @@ wxMask *wxPNGReader::CreateMask(void) else ::SetPixel(dc, x, GetHeight() - y - 1, RGB(255, 255, 255)); - } + } } ::SelectObject(dc, oldBitmap); wxMask *mask = new wxMask; @@ -385,236 +384,238 @@ wxMask *wxPNGReader::CreateMask(void) return mask; } -bool wxPNGReader::ReadFile(char * ImageFileName) +bool wxPNGReader::ReadFile(wxChar * ImageFileName) { - int number_passes; + if (ImageFileName) + wxStrcpy(filename, ImageFileName); - if (ImageFileName) - strcpy(filename, ImageFileName); - - FILE *fp; - png_struct *png_ptr; - png_info *info_ptr; - wxPNGReaderIter iter(this); - - /* open the file */ - fp = fopen(filename, "rb"); - if (!fp) - return FALSE; - - /* allocate the necessary structures */ - png_ptr = new (png_struct); - if (!png_ptr) - { - fclose(fp); - return FALSE; - } - - info_ptr = new (png_info); - if (!info_ptr) - { - fclose(fp); - delete(png_ptr); - return FALSE; - } - /* set error handling */ - if (setjmp(png_ptr->jmpbuf)) - { - png_read_destroy(png_ptr, info_ptr, (png_info *)0); - fclose(fp); - delete(png_ptr); - delete(info_ptr); - - /* If we get here, we had a problem reading the file */ - return FALSE; - } - //png_set_error(ima_png_error, NULL); + /* open the file */ + FILE *fp = fopen(wxConvFile.cWX2MB(filename), "rb"); + if (!fp) + return FALSE; - /* initialize the structures, info first for error handling */ - png_info_init(info_ptr); - png_read_init(png_ptr); + /* allocate the necessary structures */ + png_struct *png_ptr = new (png_struct); + if (!png_ptr) + { + fclose(fp); + return FALSE; + } - /* set up the input control */ - png_init_io(png_ptr, fp); + png_info *info_ptr = new (png_info); + if (!info_ptr) + { + fclose(fp); + delete(png_ptr); + return FALSE; + } - /* read the file information */ - png_read_info(png_ptr, info_ptr); + /* set error handling */ + if (setjmp(png_ptr->jmpbuf)) + { + png_read_destroy(png_ptr, info_ptr, (png_info *)0); + fclose(fp); + delete(png_ptr); + delete(info_ptr); + + /* If we get here, we had a problem reading the file */ + return FALSE; + } + //png_set_error(ima_png_error, NULL); + + /* initialize the structures, info first for error handling */ + png_info_init(info_ptr); + png_read_init(png_ptr); + + /* set up the input control */ + png_init_io(png_ptr, fp); + + /* read the file information */ + png_read_info(png_ptr, info_ptr); - /* allocate the memory to hold the image using the fields - of png_info. */ - png_color_16 my_background={ 0, 31, 127, 255, 0 }; + /* allocate the memory to hold the image using the fields + of png_info. */ + png_color_16 my_background={ 0, 31, 127, 255, 0 }; - if (info_ptr->valid & PNG_INFO_bKGD) + if (info_ptr->valid & PNG_INFO_bKGD) { - png_set_background(png_ptr, &(info_ptr->background), - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); + png_set_background(png_ptr, &(info_ptr->background), + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); if ( info_ptr->num_palette > 0 ) bgindex = info_ptr->background.index; } - else { - png_set_background(png_ptr, &my_background, - PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); + else { + png_set_background(png_ptr, &my_background, + PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); // Added by JACS: guesswork! if ( info_ptr->num_trans != 0 ) bgindex = info_ptr->num_trans - 1 ; - } + } - /* tell libpng to strip 16 bit depth files down to 8 bits */ - if (info_ptr->bit_depth == 16) - png_set_strip_16(png_ptr); + /* tell libpng to strip 16 bit depth files down to 8 bits */ + if (info_ptr->bit_depth == 16) + png_set_strip_16(png_ptr); - int pixel_depth=(info_ptr->pixel_depth<24) ? info_ptr->pixel_depth: 24; - Create(info_ptr->width, info_ptr->height, pixel_depth, - info_ptr->color_type); + int pixel_depth=(info_ptr->pixel_depth<24) ? info_ptr->pixel_depth: 24; + Create(info_ptr->width, info_ptr->height, pixel_depth, + info_ptr->color_type); - if (info_ptr->num_palette>0) + if (info_ptr->num_palette>0) { - SetPalette((int)info_ptr->num_palette, (rgb_color_struct*)info_ptr->palette); + SetPalette((int)info_ptr->num_palette, (rgb_color_struct*)info_ptr->palette); } - int row_stride = info_ptr->width * ((pixel_depth+7)>>3); - // printf("P = %d D = %d RS= %d ", info_ptr->num_palette, info_ptr->pixel_depth,row_stride); -// printf("CT = %d TRS = %d BD= %d ", info_ptr->color_type, info_ptr->valid & PNG_INFO_tRNS,info_ptr->bit_depth); - - byte *row_pointers = new byte[row_stride]; - - /* turn on interlace handling */ - if (info_ptr->interlace_type) - number_passes = png_set_interlace_handling(png_ptr); - else - number_passes = 1; -// printf("NP = %d ", number_passes); - - for (int pass=0; pass< number_passes; pass++) { - iter.upset(); - int y=0; - do { -// (unsigned char *)iter.GetRow(); - if (info_ptr->interlace_type) { - if (pass>0) - iter.GetRow(row_pointers, row_stride); - png_read_row(png_ptr, row_pointers, NULL); - } - else - png_read_row(png_ptr, row_pointers, NULL); - - iter.SetRow(row_pointers, row_stride); - y++; - } while(iter.PrevRow()); -// printf("Y=%d ",y); - } - delete[] row_pointers; - - /* read the rest of the file, getting any additional chunks - in info_ptr */ - png_read_end(png_ptr, info_ptr); - - /* clean up after the read, and free any memory allocated */ - png_read_destroy(png_ptr, info_ptr, (png_info *)0); - - /* free the structures */ - delete(png_ptr); - delete(info_ptr); - - /* close the file */ - fclose(fp); - - /* that's it */ - return TRUE; + int row_stride = info_ptr->width * ((pixel_depth+7)>>3); + // printf("P = %d D = %d RS= %d ", info_ptr->num_palette, info_ptr->pixel_depth,row_stride); + // printf("CT = %d TRS = %d BD= %d ", info_ptr->color_type, info_ptr->valid & PNG_INFO_tRNS,info_ptr->bit_depth); + + byte *row_pointers = new byte[row_stride]; + + /* turn on interlace handling */ + int number_passes; + if (info_ptr->interlace_type) + number_passes = png_set_interlace_handling(png_ptr); + else + number_passes = 1; + // printf("NP = %d ", number_passes); + + // don't use the object to prevent warnings from VC++ about "unportable + // interaction between setjmp and C++ object destruction" (this is a correct + // warning, of course!) + wxPNGReaderIter *iter = new wxPNGReaderIter(this); + for (int pass=0; pass< number_passes; pass++) + { + iter->upset(); + int y=0; + do { + //(unsigned char *)iter.GetRow(); + if (info_ptr->interlace_type) { + if (pass>0) + iter->GetRow(row_pointers, row_stride); + png_read_row(png_ptr, row_pointers, NULL); + } + else + png_read_row(png_ptr, row_pointers, NULL); + + iter->SetRow(row_pointers, row_stride); + y++; + } while(iter->PrevRow()); + // printf("Y=%d ",y); + } + + delete iter; + delete[] row_pointers; + + /* read the rest of the file, getting any additional chunks + in info_ptr */ + png_read_end(png_ptr, info_ptr); + + /* clean up after the read, and free any memory allocated */ + png_read_destroy(png_ptr, info_ptr, (png_info *)0); + + /* free the structures */ + delete(png_ptr); + delete(info_ptr); + + /* close the file */ + fclose(fp); + + /* that's it */ + return TRUE; } /* write a png file */ -bool wxPNGReader::SaveFile(char * ImageFileName) +bool wxPNGReader::SaveFile(wxChar * ImageFileName) { if (ImageFileName) - strcpy(filename, ImageFileName); + wxStrcpy(filename, ImageFileName); wxPNGReaderIter iter(this); FILE *fp; png_struct *png_ptr; - png_info *info_ptr; + png_info *info_ptr; /* open the file */ - fp = fopen(filename, "wb"); - if (!fp) - return FALSE; - - /* allocate the necessary structures */ - png_ptr = new (png_struct); - if (!png_ptr) - { - fclose(fp); - return FALSE; - } - - info_ptr = new (png_info); - if (!info_ptr) - { - fclose(fp); - delete(png_ptr); - return FALSE; - } - - /* set error handling */ - if (setjmp(png_ptr->jmpbuf)) - { - png_write_destroy(png_ptr); - fclose(fp); - delete(png_ptr); - delete(info_ptr); - - /* If we get here, we had a problem reading the file */ - return FALSE; - } + fp = fopen(wxConvFile.cWX2MB(filename), "wb"); + if (!fp) + return FALSE; + + /* allocate the necessary structures */ + png_ptr = new (png_struct); + if (!png_ptr) + { + fclose(fp); + return FALSE; + } + + info_ptr = new (png_info); + if (!info_ptr) + { + fclose(fp); + delete(png_ptr); + return FALSE; + } + + /* set error handling */ + if (setjmp(png_ptr->jmpbuf)) + { + png_write_destroy(png_ptr); + fclose(fp); + delete(png_ptr); + delete(info_ptr); + + /* If we get here, we had a problem reading the file */ + return FALSE; + } //png_set_error(ima_png_error, NULL); -// printf("writig pg %s ", filename); +// printf("writig pg %s ", filename); /* initialize the structures */ - png_info_init(info_ptr); - png_write_init(png_ptr); - - int row_stride = GetWidth() * ((GetDepth()+7)>>3); - /* set up the output control */ + png_info_init(info_ptr); + png_write_init(png_ptr); + + int row_stride = GetWidth() * ((GetDepth()+7)>>3); + /* set up the output control */ png_init_io(png_ptr, fp); - /* set the file information here */ - info_ptr->width = GetWidth(); - info_ptr->height = GetHeight(); - info_ptr->pixel_depth = GetDepth(); - info_ptr->channels = (GetDepth()>8) ? 3: 1; - info_ptr->bit_depth = GetDepth()/info_ptr->channels; - info_ptr->color_type = GetColorType(); - info_ptr->compression_type = info_ptr->filter_type = info_ptr->interlace_type=0; - info_ptr->valid = 0; - info_ptr->rowbytes = row_stride; + /* set the file information here */ + info_ptr->width = GetWidth(); + info_ptr->height = GetHeight(); + info_ptr->pixel_depth = GetDepth(); + info_ptr->channels = (GetDepth()>8) ? 3: 1; + info_ptr->bit_depth = GetDepth()/info_ptr->channels; + info_ptr->color_type = GetColorType(); + info_ptr->compression_type = info_ptr->filter_type = info_ptr->interlace_type=0; + info_ptr->valid = 0; + info_ptr->rowbytes = row_stride; // printf("P = %d D = %d RS= %d GD= %d CH= %d ", info_ptr->pixel_depth, info_ptr->bit_depth, row_stride, GetDepth(), info_ptr->channels); - /* set the palette if there is one */ - if ((GetColorType() & COLORTYPE_PALETTE) && GetPalette()) - { -// printf("writing paleta[%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette()); - info_ptr->valid |= PNG_INFO_PLTE; - info_ptr->palette = new png_color[256]; - info_ptr->num_palette = 256; - for (int i=0; i<256; i++) - GetPalette()->GetRGB(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue); - } -// printf("Paleta [%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette()); + /* set the palette if there is one */ + if ((GetColorType() & COLORTYPE_PALETTE) && GetPalette()) + { +// printf("writing paleta[%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette()); + info_ptr->valid |= PNG_INFO_PLTE; + info_ptr->palette = new png_color[256]; + info_ptr->num_palette = 256; + for (int i=0; i<256; i++) + GetPalette()->GetRGB(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue); + } +// printf("Paleta [%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette()); /* optional significant bit chunk */ // info_ptr->valid |= PNG_INFO_sBIT; // info_ptr->sig_bit = true_bit_depth; - /* optional gamma chunk */ + /* optional gamma chunk */ // info_ptr->valid |= PNG_INFO_gAMA; // info_ptr->gamma = gamma; - /* other optional chunks */ + /* other optional chunks */ /* write the file information */ png_write_info(png_ptr, info_ptr); @@ -622,14 +623,14 @@ bool wxPNGReader::SaveFile(char * ImageFileName) /* set up the transformations you want. Note that these are all optional. Only call them if you want them */ - /* shift the pixels up to a legal bit depth and fill in + /* shift the pixels up to a legal bit depth and fill in as appropriate to correctly scale the image */ // png_set_shift(png_ptr, &(info_ptr->sig_bit)); - /* pack pixels into bytes */ + /* pack pixels into bytes */ // png_set_packing(png_ptr); - /* flip bgr pixels to rgb */ + /* flip bgr pixels to rgb */ // png_set_bgr(png_ptr); /* swap bytes of 16 bit files to most significant bit first */ @@ -640,35 +641,35 @@ bool wxPNGReader::SaveFile(char * ImageFileName) /* If you are only writing one row at a time, this works */ - byte *row_pointers = new byte[row_stride]; - iter.upset(); - do { -// (unsigned char *)iter.GetRow(); - iter.GetRow(row_pointers, row_stride); - png_write_row(png_ptr, row_pointers); - } while(iter.PrevRow()); - + byte *row_pointers = new byte[row_stride]; + iter.upset(); + do { +// (unsigned char *)iter.GetRow(); + iter.GetRow(row_pointers, row_stride); + png_write_row(png_ptr, row_pointers); + } while(iter.PrevRow()); + delete[] row_pointers; /* write the rest of the file */ png_write_end(png_ptr, info_ptr); - /* clean up after the write, and free any memory allocated */ + /* clean up after the write, and free any memory allocated */ png_write_destroy(png_ptr); /* if you malloced the palette, free it here */ if (info_ptr->palette) - delete[] (info_ptr->palette); + delete[] (info_ptr->palette); - /* free the structures */ - delete(png_ptr); - delete(info_ptr); + /* free the structures */ + delete(png_ptr); + delete(info_ptr); - /* close the file */ - fclose(fp); + /* close the file */ + fclose(fp); - /* that's it */ - return TRUE; + /* that's it */ + return TRUE; } static int Power(int x, int y) @@ -693,16 +694,16 @@ static void DecToHex(int dec, char *buf) buf[1] = hexArray[secondDigit]; buf[2] = 0; } - -bool wxPNGReader::SaveXPM(char *filename, char *name) + +bool wxPNGReader::SaveXPM(wxChar *filename, wxChar *name) { - char nameStr[256]; + wxChar nameStr[256]; if ( name ) - strcpy(nameStr, name); + wxStrcpy(nameStr, name); else { - strcpy(nameStr, filename); + wxStrcpy(nameStr, filename); wxStripExtension(nameStr); } @@ -715,7 +716,7 @@ bool wxPNGReader::SaveXPM(char *filename, char *name) if ( !GetPalette() ) return FALSE; - ofstream str(filename); + ofstream str(wxConvFile.cWX2MB(filename)); if ( str.bad() ) return FALSE; @@ -764,7 +765,7 @@ bool wxPNGReader::SaveXPM(char *filename, char *name) return TRUE; } -#include +#include "wx/msw/pnghand.h" IMPLEMENT_DYNAMIC_CLASS(wxPNGFileHandler, wxBitmapHandler) @@ -772,7 +773,7 @@ bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla int desiredWidth, int desiredHeight) { wxPNGReader reader; - if (reader.ReadFile((char*) (const char*) name)) + if (reader.ReadFile(WXSTRINGCAST name)) { return reader.InstantiateBitmap(bitmap); }