From: <yu...@us...> - 2009-03-04 03:11:25
|
Revision: 3702 http://hugin.svn.sourceforge.net/hugin/?rev=3702&view=rev Author: yuv Date: 2009-03-04 03:11:24 +0000 (Wed, 04 Mar 2009) Log Message: ----------- fix: fixed path for celeste model file breaks Windows installer Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-04 01:23:00 UTC (rev 3701) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-04 03:11:24 UTC (rev 3702) @@ -423,9 +423,9 @@ strFile = MacGetPathToBundledResourceFile(CFSTR("celeste.model")); strcpy( buf, (const char*) strFile.mb_str(wxConvUTF8)); string modelfile = buf; - #else + #else char buf[100]; - strcpy( buf, INSTALL_XRC_DIR ); + strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-04 01:23:00 UTC (rev 3701) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-04 03:11:24 UTC (rev 3702) @@ -2183,7 +2183,7 @@ string modelfile = buf; #else char buf[100]; - strcpy( buf, INSTALL_XRC_DIR ); + strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-04 01:23:00 UTC (rev 3701) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-04 03:11:24 UTC (rev 3702) @@ -752,7 +752,7 @@ string modelfile = buf; #else char buf[100]; - strcpy( buf, INSTALL_XRC_DIR ); + strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |