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

fix wxMac compilation problem by hoisting simple variable declarations above all goto stmts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-03-22 16:21:55 +00:00
parent d17b1e7621
commit 7884ab9018
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imagpng.cpp
View File

@@ -508,13 +508,16 @@ wxPNGHandler::LoadFile(wxImage *image,
bool verbose, bool verbose,
int WXUNUSED(index)) int WXUNUSED(index))
{ {
// VZ: as this function uses setjmp() the only fool proof error handling // VZ: as this function uses setjmp() the only fool-proof error handling
// method is to use goto (setjmp is not really C++ dtors friendly...) // method is to use goto (setjmp is not really C++ dtors friendly...)
unsigned char **lines = NULL; unsigned char **lines = NULL;
png_infop info_ptr = (png_infop) NULL; png_infop info_ptr = (png_infop) NULL;
wxPNGInfoStruct wxinfo; wxPNGInfoStruct wxinfo;
png_uint_32 i, width, height = 0;
int bit_depth, color_type, interlace_type;
wxinfo.verbose = verbose; wxinfo.verbose = verbose;
wxinfo.stream.in = &stream; wxinfo.stream.in = &stream;
@@ -541,9 +544,6 @@ wxPNGHandler::LoadFile(wxImage *image,
if (setjmp(wxinfo.jmpbuf)) if (setjmp(wxinfo.jmpbuf))
goto error; goto error;
png_uint_32 i, width, height = 0;
int bit_depth, color_type, interlace_type;
png_read_info( png_ptr, info_ptr ); png_read_info( png_ptr, info_ptr );
png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL ); png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL );