From: <po...@us...> - 2008-01-25 12:22:40
|
Revision: 2697 http://hugin.svn.sourceforge.net/hugin/?rev=2697&view=rev Author: pooh22 Date: 2008-01-25 04:22:37 -0800 (Fri, 25 Jan 2008) Log Message: ----------- fix gcc 4.2 compiler warning Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/LensPanel.cpp hugin/trunk/src/hugin1/hugin/LensPanel.h Modified: hugin/trunk/src/hugin1/hugin/LensPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2008-01-25 12:21:47 UTC (rev 2696) +++ hugin/trunk/src/hugin1/hugin/LensPanel.cpp 2008-01-25 12:22:37 UTC (rev 2697) @@ -307,7 +307,7 @@ XRCCTRL(*this, "lens_val_responseType", wxChoice)->SetSelection( pano.getImage(*m_selectedImages.begin()).getOptions().responseType); - for (char** varname = m_varNames; *varname != 0; ++varname) { + for (const char** varname = m_varNames; *varname != 0; ++varname) { // update parameters int ndigits = m_distDigitsEdit; if (strcmp(*varname, "hfov") == 0 || strcmp(*varname, "d") == 0 || @@ -1110,7 +1110,7 @@ } } -char *LensPanel::m_varNames[] = { "v", "a", "b", "c", "d", "e", "g", "t", +const char *LensPanel::m_varNames[] = { "v", "a", "b", "c", "d", "e", "g", "t", "Eev", "Er", "Eb", "Vb", "Vc", "Vd", "Vx", "Vy", "Ra", "Rb", "Rc", "Rd", "Re", 0}; Modified: hugin/trunk/src/hugin1/hugin/LensPanel.h =================================================================== --- hugin/trunk/src/hugin1/hugin/LensPanel.h 2008-01-25 12:21:47 UTC (rev 2696) +++ hugin/trunk/src/hugin1/hugin/LensPanel.h 2008-01-25 12:22:37 UTC (rev 2697) @@ -141,7 +141,7 @@ bool m_restoreLayoutOnResize; - static char *m_varNames[]; + static const char *m_varNames[]; DECLARE_EVENT_TABLE() }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |