From 702ca7c0704ae15a0ae7aa68588004d6f8d469f4 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 8 Jan 1999 10:23:39 +0000 Subject: [PATCH] Compile improvemnts for strict compilers and the like Down to two warning messages for egcs compile git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/docview.h | 6 +- include/wx/gtk/checklst.h | 2 +- include/wx/gtk1/checklst.h | 2 +- setup/maketmpl.in | 4 +- src/common/config.cpp | 7 +- src/common/docview.cpp | 4 +- src/common/filefn.cpp | 3 +- src/common/image.cpp | 331 +++++++++++++++++++------------------ 8 files changed, 184 insertions(+), 175 deletions(-) diff --git a/include/wx/docview.h b/include/wx/docview.h index a249f933b8..ba1b413a12 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -34,7 +34,7 @@ class WXDLLEXPORT wxPrintInfo; class WXDLLEXPORT wxCommand; class WXDLLEXPORT wxCommandProcessor; class WXDLLEXPORT wxFileHistory; -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG class WXDLLEXPORT wxConfigBase; #endif @@ -344,7 +344,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler virtual wxString GetHistoryFile(int i) const; virtual void FileHistoryUseMenu(wxMenu *menu); virtual void FileHistoryRemoveMenu(wxMenu *menu); -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG virtual void FileHistoryLoad(wxConfigBase& config); virtual void FileHistorySave(wxConfigBase& config); #endif @@ -516,7 +516,7 @@ class WXDLLEXPORT wxFileHistory: public wxObject // Remove menu from the list (MDI child may be closing) virtual void RemoveMenu(wxMenu *menu); -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG virtual void Load(wxConfigBase& config); virtual void Save(wxConfigBase& config); #endif diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h index 878adc2956..4331972d9f 100644 --- a/include/wx/gtk/checklst.h +++ b/include/wx/gtk/checklst.h @@ -41,7 +41,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int nStrings = 0, - const wxString choices[] = NULL, + const wxString choices[] = (wxString[]) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h index 878adc2956..4331972d9f 100644 --- a/include/wx/gtk1/checklst.h +++ b/include/wx/gtk1/checklst.h @@ -41,7 +41,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int nStrings = 0, - const wxString choices[] = NULL, + const wxString choices[] = (wxString[]) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); diff --git a/setup/maketmpl.in b/setup/maketmpl.in index 9526467f1b..de91877e83 100644 --- a/setup/maketmpl.in +++ b/setup/maketmpl.in @@ -33,11 +33,11 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@ CC = @CC@ CPP = @CPP@ CPPFLAGS=@CPPFLAGS@ -CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT +CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) # c++-compiler stuff CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT +CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) CXXCPP = @CXXCPP@ # shared compile stuff diff --git a/src/common/config.cpp b/src/common/config.cpp index 79613109ac..47cf94f498 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -273,9 +273,9 @@ wxString wxExpandEnvVars(const wxString& str) { Bracket_None, Bracket_Normal = ')', - Bracket_Curly = '}', + Bracket_Curly = '}' #ifdef __WXMSW__ - Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) + ,Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) #endif }; @@ -411,5 +411,4 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) #endif // wxUSE_CONFIG - - \ No newline at end of file + diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 710d9f5f52..26281bef27 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -1044,7 +1044,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu) m_fileHistory->RemoveMenu(menu); } -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG void wxDocManager::FileHistoryLoad(wxConfigBase& config) { if (m_fileHistory) @@ -1822,7 +1822,7 @@ void wxFileHistory::RemoveMenu(wxMenu *menu) m_fileMenus.DeleteObject(menu); } -#ifdef wxUSE_CONFIG +#if wxUSE_CONFIG void wxFileHistory::Load(wxConfigBase& config) { m_fileHistoryN = 0; diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 9027d5e2dc..e9f0c9105f 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -174,7 +174,8 @@ wxString wxPathList::FindValidPath (const wxString& file) char buf[_MAXPATHLEN]; strcpy(buf, wxBuffer); - char *filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf; + char *filename = (char*) NULL; /* shut up buggy egcs warning */ + filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf; for (wxNode * node = First (); node; node = node->Next ()) { diff --git a/src/common/image.cpp b/src/common/image.cpp index 7ba1dbdcb1..fa252b31df 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -446,180 +446,184 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name ) { - FILE *f; - png_structp png_ptr; - png_infop info_ptr; - unsigned char *ptr, **lines, *ptr2; - int transp,bit_depth,color_type,interlace_type; - png_uint_32 width, height; - unsigned int i; - - image->Destroy(); + image->Destroy(); - transp = 0; - png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if (!png_ptr) return FALSE; - - info_ptr = png_create_info_struct( png_ptr ); - if (!info_ptr) - { - png_destroy_read_struct( &png_ptr, NULL, NULL ); - return FALSE; - } - - if (setjmp(png_ptr->jmpbuf)) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } + png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, + (voidp) NULL, (png_error_ptr) NULL, (png_error_ptr) NULL ); + if (!png_ptr) return FALSE; + + png_infop info_ptr = png_create_info_struct( png_ptr ); + if (!info_ptr) + { + png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL ); + return FALSE; + } + + if (setjmp(png_ptr->jmpbuf)) + { + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + return FALSE; + } + + if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + return FALSE; + } - f = fopen( name, "rb" ); - png_init_io( png_ptr, f ); + FILE *f = fopen( name, "rb" ); + png_init_io( png_ptr, f ); - png_read_info( png_ptr, info_ptr ); - png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL ); + png_uint_32 width,height; + int bit_depth,color_type,interlace_type; + + 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 ); - if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand( png_ptr ); + if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand( png_ptr ); - png_set_strip_16( png_ptr ); - png_set_packing( png_ptr ); - if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_expand( png_ptr ); - png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); + png_set_strip_16( png_ptr ); + png_set_packing( png_ptr ); + if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_expand( png_ptr ); + png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); - image->Create( width, height ); + image->Create( width, height ); - if (!image->Ok()) - { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } + if (!image->Ok()) + { + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + return FALSE; + } - lines = (unsigned char **)malloc( height * sizeof(unsigned char *) ); - if (lines == NULL) - { - image->Destroy(); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } + unsigned char **lines = (unsigned char **)malloc( height * sizeof(unsigned char *) ); + if (lines == NULL) + { + image->Destroy(); + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + return FALSE; + } - for (i = 0; i < height; i++) - { - if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL) - { - image->Destroy(); - for (unsigned int n = 0; n < i; n++) free( lines[n] ); - free( lines ); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - return FALSE; - } - } + for (unsigned int i = 0; i < height; i++) + { + if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL) + { + image->Destroy(); + for (unsigned int n = 0; n < i; n++) free( lines[n] ); + free( lines ); + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + return FALSE; + } + } - png_read_image( png_ptr, lines ); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - ptr = image->GetData(); - if ((color_type == PNG_COLOR_TYPE_GRAY) || - (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) - { + + int transp = 0; + png_read_image( png_ptr, lines ); + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); + unsigned char *ptr = image->GetData(); + if ((color_type == PNG_COLOR_TYPE_GRAY) || + (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) + { for (unsigned int y = 0; y < height; y++) - { - ptr2 = lines[y]; - for (unsigned int x = 0; x < width; x++) - { - unsigned char r = *ptr2++; - unsigned char a = *ptr2++; - if (a < 128) - { - *ptr++ = 255; - *ptr++ = 0; - *ptr++ = 255; - transp = 1; - } - else - { - *ptr++ = r; - *ptr++ = r; - *ptr++ = r; - } - } - } - } - else - { + { + unsigned char *ptr2 = lines[y]; + for (unsigned int x = 0; x < width; x++) + { + unsigned char r = *ptr2++; + unsigned char a = *ptr2++; + if (a < 128) + { + *ptr++ = 255; + *ptr++ = 0; + *ptr++ = 255; + transp = 1; + } + else + { + *ptr++ = r; + *ptr++ = r; + *ptr++ = r; + } + } + } + } + else + { for (unsigned int y = 0; y < height; y++) - { - ptr2 = lines[y]; - for (unsigned int x = 0; x < width; x++) - { - unsigned char r = *ptr2++; - unsigned char g = *ptr2++; - unsigned char b = *ptr2++; - unsigned char a = *ptr2++; - if (a < 128) - { - *ptr++ = 255; - *ptr++ = 0; - *ptr++ = 255; - transp = 1; - } - else - { - if ((r == 255) && (g == 0) && (b == 255)) r = 254; - *ptr++ = r; - *ptr++ = g; - *ptr++ = b; - } - } - } - } - for (i = 0; i < height; i++) free( lines[i] ); - free( lines ); - if (transp) - image->SetMaskColour( 255, 0, 255 ); - else - image->SetMask( FALSE ); + { + unsigned char *ptr2 = lines[y]; + for (unsigned int x = 0; x < width; x++) + { + unsigned char r = *ptr2++; + unsigned char g = *ptr2++; + unsigned char b = *ptr2++; + unsigned char a = *ptr2++; + if (a < 128) + { + *ptr++ = 255; + *ptr++ = 0; + *ptr++ = 255; + transp = 1; + } + else + { + if ((r == 255) && (g == 0) && (b == 255)) r = 254; + *ptr++ = r; + *ptr++ = g; + *ptr++ = b; + } + } + } + } + + for (unsigned int i = 0; i < height; i++) free( lines[i] ); + free( lines ); + + if (transp) + { + image->SetMaskColour( 255, 0, 255 ); + } + else + { + image->SetMask( FALSE ); + } - return TRUE; + return TRUE; } bool wxPNGHandler::SaveFile( wxImage *image, const wxString& name ) { - FILE *f = fopen( name, "wb" ); - if (f) - { - png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + FILE *f = fopen( name, "wb" ); + if (!f) return FALSE; + + png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, + (voidp) NULL, (png_error_ptr) NULL, (png_error_ptr) NULL); if (!png_ptr) { - fclose( f ); - return FALSE; + fclose( f ); + return FALSE; } png_infop info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { - fclose(f); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; + fclose(f); + png_destroy_write_struct( &png_ptr, (png_infopp) NULL ); + return FALSE; } if (setjmp(png_ptr->jmpbuf)) { - fclose( f ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; + fclose( f ); + png_destroy_write_struct( &png_ptr, (png_infopp) NULL ); + return FALSE; } png_init_io( png_ptr, f ); png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), 8, - PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, + PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - + png_color_8 sig_bit; sig_bit.red = 8; sig_bit.green = 8; @@ -633,36 +637,41 @@ bool wxPNGHandler::SaveFile( wxImage *image, const wxString& name ) unsigned char *data = (unsigned char *)malloc( image->GetWidth()*4 ); if (!data) { - fclose( f ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; + fclose( f ); + png_destroy_write_struct( &png_ptr, (png_infopp) NULL ); + return FALSE; } for (int y = 0; y < image->GetHeight(); y++) { - unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3); - for (int x = 0; x < image->GetWidth(); x++) - { - data[(x << 2) + 0] = *ptr++; - data[(x << 2) + 1] = *ptr++; - data[(x << 2) + 2] = *ptr++; - if ((data[(x << 2) + 0] == image->GetMaskRed()) && - (data[(x << 2) + 1] == image->GetMaskGreen()) && - (data[(x << 2) + 2] == image->GetMaskBlue())) - data[(x << 2) + 3] = 0; - else - data[(x << 2) + 3] = 255; - } - png_bytep row_ptr = data; - png_write_rows( png_ptr, &row_ptr, 1 ); + unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3); + for (int x = 0; x < image->GetWidth(); x++) + { + data[(x << 2) + 0] = *ptr++; + data[(x << 2) + 1] = *ptr++; + data[(x << 2) + 2] = *ptr++; + if ((data[(x << 2) + 0] == image->GetMaskRed()) && + (data[(x << 2) + 1] == image->GetMaskGreen()) && + (data[(x << 2) + 2] == image->GetMaskBlue())) + { + data[(x << 2) + 3] = 0; + } + else + { + data[(x << 2) + 3] = 255; + } + } + png_bytep row_ptr = data; + png_write_rows( png_ptr, &row_ptr, 1 ); } + free(data); png_write_end( png_ptr, info_ptr ); - png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); + png_destroy_write_struct( &png_ptr, (png_infopp) NULL ); fclose(f); - } - return TRUE; + + return TRUE; } #endif -- 2.45.2