Hugin

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2467

Modified Files:
	ImagesPanel.cpp 
Log Message:
I'm sorry. I was wrong... putting it back to the previous version

Index: ImagesPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesPanel.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ImagesPanel.cpp	30 Mar 2005 10:54:30 -0000	1.79
+++ ImagesPanel.cpp	30 Mar 2005 13:03:54 -0000	1.80
@@ -454,8 +454,7 @@
     // we need to resize it to its maximum size every time before
     // a new image is set, else it will keep the old size..
     // however, I'm not sure how this should be done with wxWindows
-    
-#ifdef USE_WX25x // images_selected_image_panel only exists in 2.5 xrc file.
+
     // get size from parent panel (its just there, to provide the size..
     wxPanel * imgctrlpanel = XRCCTRL(*this, "images_selected_image_panel", wxPanel);
     DEBUG_ASSERT(imgctrlpanel);
@@ -468,11 +467,6 @@
 #endif
     wxStaticBitmap * imgctrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
     DEBUG_ASSERT(imgctrl);
-#else
-    wxStaticBitmap * imgctrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
-    DEBUG_ASSERT(imgctrl);
-    wxSize sz = imgctrl->GetSize();
-#endif
     const wxImage * img = ImageCache::getInstance().getSmallImage(
         pano.getImage(imgNr).getFilename());

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32371

Modified Files:
	NonaStitcherPanel.cpp 
Log Message:
adding mac specific codes

Index: NonaStitcherPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/NonaStitcherPanel.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- NonaStitcherPanel.cpp	8 Mar 2005 20:17:26 -0000	1.34
+++ NonaStitcherPanel.cpp	30 Mar 2005 11:03:45 -0000	1.35
@@ -351,8 +351,10 @@
 #endif
             {
                 wxProgressDialog progress(_("Running Enblend"),_("Enblend will take a while to finish processing the panorama\nYou can watch the enblend progress in the command window"));
+                
+                wxString cmdline;
 #ifdef unix
-        wxString cmdline = enblendExe + wxT(" ") + args;
+        cmdline = enblendExe + wxT(" ") + args;
 		DEBUG_DEBUG("using system() to execute enblend with cmdline:" << cmdline.mb_str());
 		int ret = system(cmdline.mb_str());
 		if (ret == -1) {
@@ -362,7 +364,7 @@
 		    ret = WEXITSTATUS(ret);
 		}
 #elif __WXMSW__
-                wxString cmdline = wxString(wxT("enblend.exe ")) + args;
+                cmdline = wxString(wxT("enblend.exe ")) + args;
                 // using CreateProcess on windows
                 /* CreateProcess API initialization */
                 STARTUPINFO siStartupInfo;

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31853

Modified Files:
	MainFrame.cpp 
Log Message:
minor improvement for mac package bundle handling

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- MainFrame.cpp	7 Mar 2005 20:10:42 -0000	1.137
+++ MainFrame.cpp	30 Mar 2005 11:01:44 -0000	1.138
@@ -207,7 +207,7 @@
         else
         {
             CFIndex bufLen = 1024;
-            unsigned char buffer[1024];
+            unsigned char buffer[(int) bufLen];
             if(!CFURLGetFileSystemRepresentation(XRCurl, TRUE, buffer, bufLen))
             {
                 CFRelease(XRCurl);
@@ -215,9 +215,9 @@
             }
             else
             {
-                buffer[1023] = '\0';
+                buffer[((int) bufLen) - 1] = '\0';
                 CFRelease(XRCurl);
-                m_xrcPrefix = (wxString)buffer+ wxT("/");
+                m_xrcPrefix = wxString::FromAscii( (char *) buffer) + wxT("/");
                 DEBUG_INFO("Mac: overriding xrc prefix; using mac bundled xrc files");
             }
         }

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28696

Modified Files:
	AutoCtrlPointCreator.cpp 
Log Message:
adding Mac specific code

Index: AutoCtrlPointCreator.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/AutoCtrlPointCreator.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- AutoCtrlPointCreator.cpp	7 Mar 2005 20:10:43 -0000	1.33
+++ AutoCtrlPointCreator.cpp	30 Mar 2005 10:55:26 -0000	1.34
@@ -157,8 +157,8 @@
     wxString autopanoExe = wxConfigBase::Get()->Read(wxT("/AutoPanoSift/AutopanoExe"), wxT(HUGIN_APSIFT_EXE));
     if (!wxFile::Exists(autopanoExe)){
         wxFileDialog dlg(0,_("Select autopano-sift frontend script"),
-                         "", "",
-                         "Shell Scripts (*.sh)|*.sh",
+                         wxT(""), wxT(""),
+                         wxT("Shell Scripts (*.sh)|*.sh"),
                          wxOPEN, wxDefaultPosition);
         if (dlg.ShowModal() == wxID_OK) {
             autopanoExe = dlg.GetPath();

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28221

Modified Files:
	ImagesPanel.cpp 
Log Message:
wx24 fix

Index: ImagesPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/ImagesPanel.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ImagesPanel.cpp	22 Feb 2005 10:08:10 -0000	1.78
+++ ImagesPanel.cpp	30 Mar 2005 10:54:30 -0000	1.79
@@ -454,7 +454,8 @@
     // we need to resize it to its maximum size every time before
     // a new image is set, else it will keep the old size..
     // however, I'm not sure how this should be done with wxWindows
-
+    
+#ifdef USE_WX25x // images_selected_image_panel only exists in 2.5 xrc file.
     // get size from parent panel (its just there, to provide the size..
     wxPanel * imgctrlpanel = XRCCTRL(*this, "images_selected_image_panel", wxPanel);
     DEBUG_ASSERT(imgctrlpanel);
@@ -467,6 +468,11 @@
 #endif
     wxStaticBitmap * imgctrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
     DEBUG_ASSERT(imgctrl);
+#else
+    wxStaticBitmap * imgctrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
+    DEBUG_ASSERT(imgctrl);
+    wxSize sz = imgctrl->GetSize();
+#endif
     const wxImage * img = ImageCache::getInstance().getSmallImage(
         pano.getImage(imgNr).getFilename());

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24992

Modified Files:
	RunOptimizerFrame.cpp 
Log Message:
adding Mac specific codes

Index: RunOptimizerFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/RunOptimizerFrame.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- RunOptimizerFrame.cpp	7 Mar 2005 20:10:42 -0000	1.25
+++ RunOptimizerFrame.cpp	30 Mar 2005 10:48:41 -0000	1.26
@@ -30,6 +30,7 @@
 #include "panoinc.h"
 #include "common/wxPlatform.h"
 
+#include "hugin/config_defaults.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/RunOptimizerFrame.h"
 #include "hugin/huginApp.h"
@@ -116,6 +117,20 @@
             wxLogError(_("No PTOptimizer.exe selected"));
         }
     }
+#elif (defined __WXMAC__)
+    wxString optimizerExe = config->Read(wxT("/PanoTools/PTOptimizerExe"), wxT(HUGIN_PT_OPTIMIZER_EXE));
+    if (!wxFile::Exists(optimizerExe)){
+        wxFileDialog dlg(this,_("Select PTOptimizer"),
+                         wxT(""), optimizerExe,
+                         wxT("Any Files |*"),
+                         wxOPEN, wxDefaultPosition);
+        if (dlg.ShowModal() == wxID_OK) {
+            optimizerExe = dlg.GetPath();
+            config->Write(wxT("/PanoTools/PTOptimizerExe"),optimizerExe);
+        } else {
+            wxLogError(_("No PTOptimizer selected"));
+        }
+    }
 #else
     wxString optimizerExe = config->Read(wxT("/PanoTools/PTOptimizerExe"),wxT("PTOptimizer"));
 #endif

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24372

Modified Files:
	huginApp.cpp 
Log Message:
minor fix in mac package bundle handling

Index: huginApp.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/huginApp.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- huginApp.cpp	22 Feb 2005 10:08:54 -0000	1.77
+++ huginApp.cpp	30 Mar 2005 10:47:33 -0000	1.78
@@ -174,7 +174,7 @@
         else
         {
             CFIndex bufLen = 1024;
-            unsigned char buffer[1024];
+            unsigned char buffer[(int) bufLen];
             if(!CFURLGetFileSystemRepresentation(XRCurl, TRUE, buffer, bufLen))
             {
                 CFRelease(XRCurl);
@@ -182,10 +182,11 @@
             }
             else
             {
-                buffer[1023] = '\0';
+                buffer[((int) bufLen) - 1] = '\0';
                 CFRelease(XRCurl);
-                xrcPrefix = (wxString)buffer+ wxT("/");
+                xrcPrefix = wxString::FromAscii( (char *) buffer) + wxT("/");
                 DEBUG_INFO("Mac: overriding xrc prefix; using mac bundled xrc files");
+                
             }
         }
     }

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23355

Modified Files:
	config_defaults.h 
Log Message:
default autopano-sift settings for mac

Index: config_defaults.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/config_defaults.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config_defaults.h	7 Mar 2005 20:09:29 -0000	1.10
+++ config_defaults.h	30 Mar 2005 10:45:16 -0000	1.11
@@ -81,7 +81,8 @@
 #define HUGIN_APKOLOR_EXE                     ""
 #define HUGIN_APKOLOR_ARGS                    ""
 
-#define HUGIN_APSIFT_EXE                      "autopano-complete.sh"
+#define HUGIN_APSIFT_EXE                      "autopano-complete-mac.sh"
+#define HUGIN_APSIFT_ARGS                     "-o %o -p %p %i"
 #endif
 
 #ifdef unix
@@ -103,6 +104,8 @@
 #define HUGIN_ENBLEND_ARGS                    "-v -z"
 
 // Autopano-SIFT args
+#ifndef HUGIN_APSIFT_ARGS
 #define HUGIN_APSIFT_ARGS                     "--output %o --imagelist %namefile"
+#endif
 
 #endif // _CONFIG_DEFAULTS_H