From: <po...@us...> - 2008-01-26 22:06:49
|
Revision: 2701 http://hugin.svn.sourceforge.net/hugin/?rev=2701&view=rev Author: pooh22 Date: 2008-01-26 14:06:47 -0800 (Sat, 26 Jan 2008) Log Message: ----------- fixes for hugin1 warnings with gcc 4.2 these can turn into errors when compiled with the latest libpano13, which has the same type of warning fixes (casting errors from char* to const char*) Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp hugin/trunk/src/hugin1/hugin/LensPanel.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-26 22:05:45 UTC (rev 2700) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-26 22:06:47 UTC (rev 2701) @@ -53,7 +53,7 @@ #else -static void PTPrintErrorWX(char* fmt, va_list ap) +static void PTPrintErrorWX(const char* fmt, va_list ap) { char message[257]; Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2008-01-26 22:05:45 UTC (rev 2700) +++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2008-01-26 22:06:47 UTC (rev 2701) @@ -877,7 +877,7 @@ cfg.Write(wxT("Lens/crop"), lens.getCropFactor()); // loop to save lens variables - char ** varname = Lens::variableNames; + const char ** varname = Lens::variableNames; while (*varname) { wxString key(wxT("Lens/")); key.append(wxString(*varname, *wxConvCurrent)); @@ -1024,7 +1024,7 @@ DEBUG_DEBUG("read lens hfov: " << d); // loop to load lens variables - char ** varname = Lens::variableNames; + const char ** varname = Lens::variableNames; while (*varname) { wxString key(wxT("Lens/")); key.append(wxString(*varname, *wxConvCurrent)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |