From: <har...@us...> - 2009-03-15 14:41:38
|
Revision: 3740 http://hugin.svn.sourceforge.net/hugin/?rev=3740&view=rev Author: harryvanderwolf Date: 2009-03-15 14:41:22 +0000 (Sun, 15 Mar 2009) Log Message: ----------- [OSX] fix use of celeste.model within mac bundle after svn3705 patch 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-15 13:51:28 UTC (rev 3739) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-15 14:41:22 UTC (rev 3740) @@ -416,12 +416,18 @@ char * old_locale = setlocale(LC_NUMERIC,NULL); setlocale(LC_NUMERIC,"C"); - // determine file name of SVM model file - // get XRC path from application - wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); - // convert wxString to string + // determine file name of SVM model file + // get XRC path from application + wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); + // convert wxString to string string strModelFileName(wxstrModelFileName.mb_str(wxConvUTF8)); - + #if __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE + char buf[100]; + wxstrModelFileName = MacGetPathToBundledResourceFile(CFSTR("celeste.model")); + strcpy( buf, (const char*) wxstrModelFileName.mb_str(wxConvUTF8)); + strModelFileName = buf; + #endif + // SVM model file if ( wxFile::Exists(wxstrModelFileName) ) { Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-15 13:51:28 UTC (rev 3739) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-15 14:41:22 UTC (rev 3740) @@ -2180,6 +2180,13 @@ wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); // convert wxString to string string strModelFileName(wxstrModelFileName.mb_str(wxConvUTF8)); + #if __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE + char buf[100]; + wxstrModelFileName = MacGetPathToBundledResourceFile(CFSTR("celeste.model")); + strcpy( buf, (const char*) wxstrModelFileName.mb_str(wxConvUTF8)); + strModelFileName = buf; + #endif + // SVM model file if (! wxFile::Exists(wxstrModelFileName) ) { Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-15 13:51:28 UTC (rev 3739) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-15 14:41:22 UTC (rev 3740) @@ -745,12 +745,19 @@ char * old_locale = setlocale(LC_NUMERIC,NULL); setlocale(LC_NUMERIC,"C"); - // determine file name of SVM model file - // get XRC path from application - wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); - // convert wxString to string + // determine file name of SVM model file + // get XRC path from application + wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); + // convert wxString to string string strModelFileName(wxstrModelFileName.mb_str(wxConvUTF8)); + #if __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE + char buf[100]; + wxstrModelFileName = MacGetPathToBundledResourceFile(CFSTR("celeste.model")); + strcpy( buf, (const char*) wxstrModelFileName.mb_str(wxConvUTF8)); + strModelFileName = buf; + #endif + // SVM model file if (! wxFile::Exists(wxstrModelFileName) ) { wxMessageBox(_("Celeste model file not found, Hugin needs to be properly installed." ), _("Fatal Error")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |