Hugin

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a13c76074617
changeset:  5718:a13c76074617
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Dec 28 12:12:16 2011 +0100
description:

[OSX] PTBatcher CLI-tool was missing from HuginTools package; minor changes to XCode project

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |   14 +++++++++-----
 mac/HuginCompleteInstaller.pmproj   |    0 
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (90 lines):

diff -r e9f4ffb22611 -r a13c76074617 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Tue Dec 27 10:57:51 2011 +0100
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Wed Dec 28 12:12:16 2011 +0100
@@ -1072,6 +1072,7 @@
 		73573E4110F9EEA300CF0ECD /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
 		73573E4210F9EEA300CF0ECD /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		73573E5210F9EEF400CF0ECD /* pano_trafo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73573E5110F9EEF400CF0ECD /* pano_trafo.cpp */; };
+		7359810C14AB2517002CF4D7 /* PTBatcher in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 734BDF5B0EB8EC19007EBA09 /* PTBatcher */; };
 		7359F22B126A18BB00D3291B /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
 		7359F235126A191100D3291B /* autooptimiser in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; };
 		7359F236126A191100D3291B /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
@@ -1829,8 +1830,8 @@
 		73CA10271296FD4900A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
 		73CA10281296FD5800A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
 		73CA10291296FD6900A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
-		73CAEC5814227A090064D5E8 /* hugin_python_interface.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
 		73CE4996124A667F001F0F42 /* icpfind.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		73D0C7ED1494DB03008C2C22 /* hierarchical_clustering_index.h in Headers */ = {isa = PBXBuildFile; fileRef = 73D0C7EC1494DB03008C2C22 /* hierarchical_clustering_index.h */; };
 		73D24B69106155D700B8A25D /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
 		73D24B6A106155D700B8A25D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		73D24B861061561400B8A25D /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
@@ -2936,7 +2937,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 7377D6BE148FD612004FE48D /* pto_gen */;
+			remoteGlobalIDString = 7377D6BE148FD612004FE48D;
 			remoteInfo = pto_gen;
 		};
 		737E48B011D3F8C6002BA8AE /* PBXContainerItemProxy */ = {
@@ -3623,6 +3624,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				7359810C14AB2517002CF4D7 /* PTBatcher in Copy Executable Files */,
 				7377D74D148FE48A004FE48D /* pto_gen in Copy Executable Files */,
 				73120196141FCA71005071A9 /* linefind in Copy Executable Files */,
 				738A8754126AE53A00DC20B6 /* autooptimiser in Copy Executable Files */,
@@ -3666,7 +3668,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				73CAEC5814227A090064D5E8 /* hugin_python_interface.framework in Copy Frameworks */,
 				73C5F87F12E309F20033A6E1 /* flann_cpp.framework in Copy Frameworks */,
 				733EAA5E125CDA8D00658EAF /* icpfind.framework in Copy Frameworks */,
 				737E497B11D3FD74002BA8AE /* localfeatures.framework in Copy Frameworks */,
@@ -4541,6 +4542,7 @@
 		73C5F7A412E2DC490033A6E1 /* flann_cpp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = flann_cpp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		73C959140DA2C9DB00E19110 /* tca_correct-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "tca_correct-static"; sourceTree = BUILT_PRODUCTS_DIR; };
 		73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_signals.dylib; path = "../../ExternalPrograms/3way-repository/lib/libboost_signals.dylib"; sourceTree = SOURCE_ROOT; };
+		73D0C7EC1494DB03008C2C22 /* hierarchical_clustering_index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hierarchical_clustering_index.h; sourceTree = "<group>"; };
 		73D24B4E106152CD00B8A25D /* cpclean */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cpclean; sourceTree = BUILT_PRODUCTS_DIR; };
 		73D24B641061556700B8A25D /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
 		73D24B9A1061566B00B8A25D /* cpclean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpclean.cpp; sourceTree = "<group>"; };
@@ -7389,6 +7391,7 @@
 		73C5F71112E212910033A6E1 /* algorithms */ = {
 			isa = PBXGroup;
 			children = (
+				73D0C7EC1494DB03008C2C22 /* hierarchical_clustering_index.h */,
 				73C5F71212E212910033A6E1 /* all_indices.h */,
 				73C5F71312E212910033A6E1 /* autotuned_index.h */,
 				73C5F71412E212910033A6E1 /* composite_index.h */,
@@ -8236,6 +8239,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				73D0C7ED1494DB03008C2C22 /* hierarchical_clustering_index.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9837,7 +9841,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "rm -f ../src/hugin_version.h\nrm -f ./build/src/hugin_version.h\n\nsed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n    -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n    -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n    -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n    -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n    -e \"s/\\${DISPLAY_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n    -e \"s/\\${HUGIN_BUILDER}/$HUGIN_BUILDER/\" \\\n    -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n    ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\"                                    >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\"   >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\"                              >> ../src/hugin_version.h\nfi";
+			shellScript = "rm -rf ../src/hugin_version.h\nrm -rf ./build/src/hugin_version.h\n\nsed -e \"s/\\${V_MAJOR}/$HUGIN_VERSION_MAJOR/\" \\\n    -e \"s/\\${V_MINOR}/$HUGIN_VERSION_MINOR/\" \\\n    -e \"s/\\${V_PATCH}/$HUGIN_VERSION_PATCH/\" \\\n    -e \"s/\\${HUGIN_WC_REVISION}/$HUGIN_WC_REVISION/\" \\\n    -e \"s/\\${HUGIN_PACKAGE_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n    -e \"s/\\${DISPLAY_VERSION}/$HUGIN_PACKAGE_VERSION/\" \\\n    -e \"s/\\${HUGIN_BUILDER}/$HUGIN_BUILDER/\" \\\n    -e \"s/^.*HUGIN_DEVELOPMENT_VERSION.*$/\\/\\/&/\" \\\n    ../src/hugin_version.h.in.cmake > ../src/hugin_version.h\n\nif [ \"$HUGIN_DEVELOPMENT_VERSION\" -gt 0 ]\nthen\n echo \"\"                                    >> ../src/hugin_version.h\n echo \"#ifndef HUGIN_DEVELOPMENT_VERSION\"   >> ../src/hugin_version.h\n echo \"#define HUGIN_DEVELOPMENT_VERSION 1\" >> ../src/hugin_version.h\n echo \"#endif\"                              >> ../src/hugin_version.h\nfi";
 		};
 		737D5EE2139BA55700829EED /* create stripped apps for installer */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10142,7 +10146,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint nona pano_modify pano_trafo pto2mk pto_gen pto_merge PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
+			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint nona pano_modify pano_trafo pto2mk pto_gen pto_merge PTBatcher PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
 		};
 		73B1AD1313A6A5D1006A3C54 /* let swig create wrapper swigpyrun.h */ = {
 			isa = PBXShellScriptBuildPhase;
diff -r e9f4ffb22611 -r a13c76074617 mac/HuginCompleteInstaller.pmproj
Binary file mac/HuginCompleteInstaller.pmproj has changed

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e9f4ffb22611
changeset:  5717:e9f4ffb22611
user:       tmodes
date:       Tue Dec 27 10:57:51 2011 +0100
description:

Code cleanup of last commit

diffstat:

 src/hugin1/hugin/huginApp.cpp |  95 ++++++++++++++++++++++--------------------
 src/hugin1/hugin/huginApp.h   |   4 -
 2 files changed, 49 insertions(+), 50 deletions(-)

diffs (212 lines):

diff -r 299352c42973 -r e9f4ffb22611 src/hugin1/hugin/huginApp.cpp
--- a/src/hugin1/hugin/huginApp.cpp	Mon Dec 26 11:04:52 2011 -0500
+++ b/src/hugin1/hugin/huginApp.cpp	Tue Dec 27 10:57:51 2011 +0100
@@ -215,14 +215,14 @@
     }
 
     // here goes and comes configuration
-    wxConfigBase * cfg = wxConfigBase::Get();
+    wxConfigBase * config = wxConfigBase::Get();
     // do not record default values in the preferences file
-    cfg->SetRecordDefaults(false);
+    config->SetRecordDefaults(false);
 
-    cfg->Flush();
+    config->Flush();
 
     // initialize i18n
-    int localeID = cfg->Read(wxT("language"), (long) HUGIN_LANGUAGE);
+    int localeID = config->Read(wxT("language"), (long) HUGIN_LANGUAGE);
     DEBUG_TRACE("localeID: " << localeID);
     {
         bool bLInit;
@@ -246,29 +246,32 @@
  *  to abort before making changes.  Prevent surprises.
  */
     // read version number of last Hugin binary to use these preferences
-    m_Version = cfg->Read(wxT("/version"),wxT(""));
+    wxString last_version = config->Read(wxT("/version"),wxT(""));
 
     // upgrade
-    if (checkVersion(m_Version,wxT(HUGIN_API_VERSION)))
+    if (checkVersion(last_version,wxT(HUGIN_API_VERSION)))
     {
-
-      wxString text = wxString::Format(_("I am Hugin version %s.  I have found preferences from an older version %s.  I might not be compatible with the older preferences.  If you experience malfunction, please go to the menu  File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),m_Version.c_str());
-
-      wxMessageBox(text, _("Warning"));
-
-      cfg->Write(wxT("/version"), wxT(HUGIN_API_VERSION));     
-      cfg->Flush();
-      
-      };
+        wxMessageBox(wxString::Format(_("I am Hugin version %s. I have found preferences from an older version %s. I might not be compatible with the older preferences. If you experience malfunction, please go to the menu File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),last_version.c_str()), 
+#ifdef _WINDOWS
+            _("Hugin"),
+#else
+            wxT(""),
+#endif
+            wxOK | wxICON_INFORMATION);
+        config->Write(wxT("/version"), wxT(HUGIN_API_VERSION));
+        config->Flush();
+    };
 
     // downgrade
-    if (checkVersion(wxT(HUGIN_API_VERSION),m_Version))
+    if (checkVersion(wxT(HUGIN_API_VERSION),last_version))
     {
-
-      wxString text = wxString::Format(_("I am Hugin version %s.  I have found preferences from a newer version %s.  I might not be compatible with the newer preferences.  If you experience malfunction, please go to the menu  File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),m_Version.c_str());
-
-      wxMessageBox(text, _("Warning"));
-      
+        wxMessageBox(wxString::Format(_("I am Hugin version %s. I have found preferences from a newer version %s. I might not be compatible with the newer preferences. If you experience malfunction, please go to the menu File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),last_version.c_str()),
+#ifdef _WINDOWS
+            _("Hugin"),
+#else
+            wxT(""),
+#endif
+            wxOK | wxICON_INFORMATION);
     };
 
     // initialize image handlers
@@ -351,7 +354,7 @@
 
     wxString cwd = wxFileName::GetCwd();
 
-    m_workDir = cfg->Read(wxT("tempDir"),wxT(""));
+    m_workDir = config->Read(wxT("tempDir"),wxT(""));
     // FIXME, make secure against some symlink attacks
     // get a temp dir
     if (m_workDir == wxT("")) {
@@ -450,7 +453,7 @@
                     // Use the first filename to set actualPath.
                     if (! actualPathSet)
                     {
-                        cfg->Write(wxT("/actualPath"), file.GetPath());
+                        config->Write(wxT("/actualPath"), file.GetPath());
                         actualPathSet = true;
                     }
                 }
@@ -474,7 +477,7 @@
 	if(secondParam.Cmp(_T("-notips"))!=0)
 	{
 		//load tip startup preferences (tips will be started after splash terminates)
-		int nValue = cfg->Read(wxT("/MainFrame/ShowStartTip"), 1l);
+		int nValue = config->Read(wxT("/MainFrame/ShowStartTip"), 1l);
 
 		//show tips if needed now
 		if(nValue > 0)
@@ -558,7 +561,7 @@
 {
     DEBUG_TRACE(basename.mb_str(wxConvLocal));
 
-    wxConfigBase * cfg = wxConfigBase::Get();
+    wxConfigBase * config = wxConfigBase::Get();
 
     // get display size
     int dx,dy;
@@ -568,37 +571,37 @@
 // restoring the splitter positions properly when maximising doesn't work.
 // Disabling maximise on wxWidgets >= 2.6.0 and gtk
         //size
-        int w = cfg->Read(wxT("/") + basename + wxT("/width"),-1l);
-        int h = cfg->Read(wxT("/") + basename + wxT("/height"),-1l);
+        int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
+        int h = config->Read(wxT("/") + basename + wxT("/height"),-1l);
         if (w > 0 && w <= dx) {
             frame->SetClientSize(w,h);
         } else {
             frame->Fit();
         }
         //position
-        int x = cfg->Read(wxT("/") + basename + wxT("/positionX"),-1l);
-        int y = cfg->Read(wxT("/") + basename + wxT("/positionY"),-1l);
+        int x = config->Read(wxT("/") + basename + wxT("/positionX"),-1l);
+        int y = config->Read(wxT("/") + basename + wxT("/positionY"),-1l);
         if ( y >= 0 && x >= 0 && x < dx && y < dy) {
             frame->Move(x, y);
         } else {
             frame->Move(0, 44);
         }
 #else
-    bool maximized = cfg->Read(wxT("/") + basename + wxT("/maximized"), 0l) != 0;
+    bool maximized = config->Read(wxT("/") + basename + wxT("/maximized"), 0l) != 0;
     if (maximized) {
         frame->Maximize();
 	} else {
         //size
-        int w = cfg->Read(wxT("/") + basename + wxT("/width"),-1l);
-        int h = cfg->Read(wxT("/") + basename + wxT("/height"),-1l);
+        int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
+        int h = config->Read(wxT("/") + basename + wxT("/height"),-1l);
         if (w > 0 && w <= dx) {
             frame->SetClientSize(w,h);
         } else {
             frame->Fit();
         }
         //position
-        int x = cfg->Read(wxT("/") + basename + wxT("/positionX"),-1l);
-        int y = cfg->Read(wxT("/") + basename + wxT("/positionY"),-1l);
+        int x = config->Read(wxT("/") + basename + wxT("/positionX"),-1l);
+        int y = config->Read(wxT("/") + basename + wxT("/positionY"),-1l);
         if ( y >= 0 && x >= 0 && x < dx && y < dy) {
             frame->Move(x, y);
         } else {
@@ -613,30 +616,30 @@
 {
     DEBUG_TRACE(basename);
 
-    wxConfigBase * cfg = wxConfigBase::Get();
+    wxConfigBase * config = wxConfigBase::Get();
 
 #if ( __WXGTK__ ) &&  wxCHECK_VERSION(2,6,0)
 // restoring the splitter positions properly when maximising doesn't work.
 // Disabling maximise on wxWidgets >= 2.6.0 and gtk
     
         wxSize sz = frame->GetClientSize();
-        cfg->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
-        cfg->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
+        config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
+        config->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
         wxPoint ps = frame->GetPosition();
-        cfg->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
-        cfg->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
-        cfg->Write(wxT("/") + basename + wxT("/maximized"), 0);
+        config->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
+        config->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
+        config->Write(wxT("/") + basename + wxT("/maximized"), 0);
 #else
     if ( (! frame->IsMaximized()) && (! frame->IsIconized()) ) {
         wxSize sz = frame->GetClientSize();
-        cfg->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
-        cfg->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
+        config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
+        config->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
         wxPoint ps = frame->GetPosition();
-        cfg->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
-        cfg->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
-        cfg->Write(wxT("/") + basename + wxT("/maximized"), 0);
+        config->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
+        config->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
+        config->Write(wxT("/") + basename + wxT("/maximized"), 0);
     } else if (frame->IsMaximized()){
-        cfg->Write(wxT("/") + basename + wxT("/maximized"), 1l);
+        config->Write(wxT("/") + basename + wxT("/maximized"), 1l);
     }
 #endif
 }
diff -r 299352c42973 -r e9f4ffb22611 src/hugin1/hugin/huginApp.h
--- a/src/hugin1/hugin/huginApp.h	Mon Dec 26 11:04:52 2011 -0500
+++ b/src/hugin1/hugin/huginApp.h	Tue Dec 27 10:57:51 2011 +0100
@@ -154,10 +154,6 @@
 #endif
 
 private:
-
-    /** API version */
-    wxString m_Version;
-    
     /** locale for internationalisation */
     wxLocale locale;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/299352c42973
changeset:  5716:299352c42973
user:       Yuval Levy <yuv@...>
date:       Mon Dec 26 11:04:52 2011 -0500
description:

merged

diffstat:

 .hgtags                                                                   |     3 +
 CMakeLists.txt                                                            |     3 +-
 CMakeModules/Findflann.cmake                                              |    25 +
 CMakeModules/win_bundle.cmake                                             |    16 +-
 doc/PTBatcherGUI.pod                                                      |    10 +-
 doc/pto_gen.pod                                                           |    56 +
 doc/releases/hugin-2011.4.0.txt                                           |   149 +
 mac/Hugin.xcodeproj/project.pbxproj                                       |   223 +-
 mac/HuginCompleteInstaller.pmproj                                         |     0 
 mac/Version.xcconfig                                                      |     2 +-
 src/foreign/CMakeLists.txt                                                |     2 +
 src/foreign/flann/CMakeLists.txt                                          |     2 +-
 src/foreign/flann/algorithms/all_indices.h                                |    68 +-
 src/foreign/flann/algorithms/autotuned_index.h                            |   636 +-
 src/foreign/flann/algorithms/composite_index.h                            |    19 +-
 src/foreign/flann/algorithms/dist.h                                       |   384 +-
 src/foreign/flann/algorithms/hierarchical_clustering_index.h              |   690 +
 src/foreign/flann/algorithms/kdtree_index.h                               |   820 +-
 src/foreign/flann/algorithms/kdtree_single_index.h                        |   597 +-
 src/foreign/flann/algorithms/kmeans_index.h                               |  1282 +-
 src/foreign/flann/algorithms/linear_index.h                               |   107 +-
 src/foreign/flann/algorithms/nn_index.h                                   |    82 +-
 src/foreign/flann/flann.cpp                                               |    11 +-
 src/foreign/flann/flann.h                                                 |   454 +-
 src/foreign/flann/flann.hpp                                               |    51 +-
 src/foreign/flann/flann_cpp.cpp                                           |    23 -
 src/foreign/flann/flann_mpi.hpp                                           |    63 +-
 src/foreign/flann/general.h                                               |    53 +-
 src/foreign/flann/io/hdf5.h                                               |   171 +-
 src/foreign/flann/nn/ground_truth.h                                       |    16 +-
 src/foreign/flann/nn/index_testing.cpp                                    |     4 +-
 src/foreign/flann/nn/index_testing.h                                      |    55 +-
 src/foreign/flann/nn/simplex_downhill.h                                   |    32 +-
 src/foreign/flann/util/allocator.h                                        |   170 +-
 src/foreign/flann/util/heap.h                                             |   259 +-
 src/foreign/flann/util/logger.h                                           |     7 +-
 src/foreign/flann/util/matrix.h                                           |    42 +-
 src/foreign/flann/util/object_factory.h                                   |    58 +-
 src/foreign/flann/util/pair_iterator.hpp                                  |   112 +-
 src/foreign/flann/util/random.h                                           |    22 +-
 src/foreign/flann/util/result_set.h                                       |   455 +-
 src/foreign/flann/util/sampling.h                                         |    16 +-
 src/foreign/flann/util/saving.cpp                                         |    20 +-
 src/foreign/flann/util/saving.h                                           |    67 +-
 src/foreign/flann/util/timer.h                                            |     9 +-
 src/hugin1/PT/Panorama.h                                                  |    21 +-
 src/hugin1/base_wx/RunStitchPanel.cpp                                     |     4 +-
 src/hugin1/calibrate_lens/LensCalFrame.cpp                                |     2 +-
 src/hugin1/hugin/AboutDialog.cpp                                          |    13 +-
 src/hugin1/hugin/CPEditorPanel.cpp                                        |     4 +-
 src/hugin1/hugin/CPImageCtrl.cpp                                          |    14 +-
 src/hugin1/hugin/GLPreviewFrame.cpp                                       |    45 +-
 src/hugin1/hugin/GLPreviewFrame.h                                         |     1 +
 src/hugin1/hugin/ImagesList.cpp                                           |    37 +-
 src/hugin1/hugin/ImagesList.h                                             |    11 +-
 src/hugin1/hugin/ImagesPanel.cpp                                          |   118 +-
 src/hugin1/hugin/MainFrame.cpp                                            |     3 +-
 src/hugin1/hugin/MaskEditorPanel.cpp                                      |     4 +-
 src/hugin1/hugin/MaskImageCtrl.cpp                                        |    11 +-
 src/hugin1/hugin/OverviewCameraTool.cpp                                   |     4 +-
 src/hugin1/hugin/PanoPanel.cpp                                            |     2 +-
 src/hugin1/hugin/PreferencesDialog.cpp                                    |     6 +
 src/hugin1/hugin/PreviewFrame.cpp                                         |     4 +-
 src/hugin1/hugin/xrc/batch_frame.xrc                                      |    26 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html                          |     6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html                           |     3 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html           |   140 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html        |     3 +
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html                       |     7 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html                  |     2 +
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html       |     4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html                        |    10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Makefile                             |    18 +
 src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html                         |    90 +
 src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk                    |    10 +
 src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc                      |     4 +
 src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp                 |     1 +
 src/hugin1/hugin/xrc/data/help_en_EN/pages.txt                            |     1 +
 src/hugin1/hugin/xrc/data/sponsors.htm                                    |     2 +-
 src/hugin1/hugin/xrc/images_panel.xrc                                     |    54 +-
 src/hugin1/hugin/xrc/pref_dialog.xrc                                      |    34 +-
 src/hugin1/hugin/xrc/preview_frame.xrc                                    |    32 +-
 src/hugin1/icpfind/AutoCtrlPointCreator.cpp                               |    63 +-
 src/hugin1/icpfind/AutoCtrlPointCreator.h                                 |     2 +
 src/hugin1/ptbatcher/Batch.cpp                                            |    25 +
 src/hugin1/ptbatcher/Batch.h                                              |     4 +
 src/hugin1/ptbatcher/BatchFrame.cpp                                       |   170 +-
 src/hugin1/ptbatcher/BatchFrame.h                                         |    22 +-
 src/hugin1/ptbatcher/FailedProjectsDialog.cpp                             |     8 +
 src/hugin1/ptbatcher/FindPanoDialog.cpp                                   |    55 +-
 src/hugin1/ptbatcher/FindPanoDialog.h                                     |     1 +
 src/hugin1/ptbatcher/PTBatcherGUI.cpp                                     |    16 -
 src/hugin1/ptbatcher/ProjectListBox.cpp                                   |     6 +-
 src/hugin_base/CMakeLists.txt                                             |     2 +
 src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp                   |   264 +-
 src/hugin_base/algorithms/basic/CalculateOptimalROI.h                     |    18 +-
 src/hugin_base/algorithms/basic/LayerStacks.cpp                           |   122 +
 src/hugin_base/algorithms/basic/LayerStacks.h                             |    39 +
 src/hugin_base/algorithms/optimizer/ImageGraph.cpp                        |     4 +-
 src/hugin_base/algorithms/optimizer/PTOptimizer.cpp                       |     8 +-
 src/hugin_base/algorithms/optimizer/PTOptimizer.h                         |     6 +-
 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp |   130 +-
 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h   |    25 +-
 src/hugin_base/hugin_utils/utils.cpp                                      |    43 +
 src/hugin_base/hugin_utils/utils.h                                        |     5 +
 src/hugin_base/panodata/ImageVariableTranslate.h                          |     1 +
 src/hugin_base/panodata/SrcPanoImage.cpp                                  |    52 +
 src/hugin_base/panodata/SrcPanoImage.h                                    |     1 +
 src/hugin_base/panodata/image_variables.h                                 |     1 +
 src/hugin_base/photometric/ResponseTransform.h                            |    11 +-
 src/hugin_base/vigra_ext/impexalpha.hxx                                   |    10 +-
 src/hugin_cpfind/cpfind/ImageImport.h                                     |    84 +-
 src/hugin_cpfind/cpfind/KDTree.h                                          |   304 +-
 src/hugin_cpfind/cpfind/KDTreeImpl.h                                      |   638 +-
 src/hugin_cpfind/cpfind/PanoDetector.cpp                                  |  2122 ++-
 src/hugin_cpfind/cpfind/PanoDetector.h                                    |   752 +-
 src/hugin_cpfind/cpfind/PanoDetectorDefs.h                                |   113 +-
 src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp                             |  1856 +-
 src/hugin_cpfind/cpfind/TestCode.cpp                                      |   506 +-
 src/hugin_cpfind/cpfind/TestCode.h                                        |    80 +-
 src/hugin_cpfind/cpfind/Tracer.h                                          |    38 +-
 src/hugin_cpfind/cpfind/Utils.cpp                                         |   139 +-
 src/hugin_cpfind/cpfind/Utils.h                                           |   159 +-
 src/hugin_cpfind/cpfind/main.cpp                                          |   631 +-
 src/hugin_cpfind/localfeatures/BoundedSet.h                               |   228 +-
 src/hugin_cpfind/localfeatures/BoxFilter.h                                |   323 +-
 src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp             |   798 +-
 src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.h               |   138 +-
 src/hugin_cpfind/localfeatures/Homography.cpp                             |   682 +-
 src/hugin_cpfind/localfeatures/Homography.h                               |   168 +-
 src/hugin_cpfind/localfeatures/Image.cpp                                  |   280 +-
 src/hugin_cpfind/localfeatures/Image.h                                    |   169 +-
 src/hugin_cpfind/localfeatures/KeyPoint.h                                 |   265 +-
 src/hugin_cpfind/localfeatures/KeyPointDescriptor.h                       |    83 +-
 src/hugin_cpfind/localfeatures/KeyPointDetector.cpp                       |   724 +-
 src/hugin_cpfind/localfeatures/KeyPointDetector.h                         |   180 +-
 src/hugin_cpfind/localfeatures/KeyPointIO.cpp                             |   203 +-
 src/hugin_cpfind/localfeatures/KeyPointIO.h                               |    96 +-
 src/hugin_cpfind/localfeatures/MathStuff.cpp                              |   210 +-
 src/hugin_cpfind/localfeatures/MathStuff.h                                |   134 +-
 src/hugin_cpfind/localfeatures/PointMatch.h                               |   150 +-
 src/hugin_cpfind/localfeatures/RansacFiltering.cpp                        |   298 +-
 src/hugin_cpfind/localfeatures/RansacFiltering.h                          |   118 +-
 src/hugin_cpfind/localfeatures/Sieve.h                                    |   186 +-
 src/hugin_cpfind/localfeatures/WaveFilter.h                               |   225 +-
 src/hugin_cpfind/localfeatures/keypoints.cpp                              |   972 +-
 src/hugin_script_interface/CMakeLists.txt                                 |     1 +
 src/hugin_script_interface/hsi.i                                          |     2 +
 src/tools/CMakeLists.txt                                                  |     9 +-
 src/tools/align_image_stack.cpp                                           |    33 +-
 src/tools/pto2mk.cpp                                                      |     3 +-
 src/tools/pto_gen.cpp                                                     |   407 +
 src/tools/pto_gen.desktop                                                 |    13 +
 src/translations/bg.po                                                    |  2709 ++--
 src/translations/ca_ES.po                                                 |  2702 ++--
 src/translations/cs_CZ.po                                                 |  2667 ++--
 src/translations/da.po                                                    |  4989 ++++----
 src/translations/de.po                                                    |  2878 ++--
 src/translations/en_GB.po                                                 |  2684 ++--
 src/translations/es.po                                                    |  2708 ++--
 src/translations/fi.po                                                    |  2689 ++--
 src/translations/fr.po                                                    |  2868 ++--
 src/translations/hu.po                                                    |  2713 ++--
 src/translations/hugin.pot                                                |  2676 ++--
 src/translations/ignored-strings.txt                                      |     1 +
 src/translations/it.po                                                    |  5302 +++++----
 src/translations/ja.po                                                    |  2696 ++--
 src/translations/ko.po                                                    |  2708 ++--
 src/translations/nl.po                                                    |  5014 ++++----
 src/translations/pl.po                                                    |  2688 ++--
 src/translations/pt_BR.po                                                 |  2711 ++--
 src/translations/ro.po                                                    |  2704 ++--
 src/translations/ru.po                                                    |  2698 ++--
 src/translations/sk.po                                                    |  2697 ++--
 src/translations/sl.po                                                    |  2710 ++--
 src/translations/sv.po                                                    |  5481 ++++-----
 src/translations/uk.po                                                    |  2707 ++--
 src/translations/zh_CN.po                                                 |  2700 ++--
 src/translations/zh_TW.po                                                 |  2705 ++--
 179 files changed, 55253 insertions(+), 46283 deletions(-)

diffs (truncated from 200711 to 500 lines):

diff -r c4c76a7dfdd5 -r 299352c42973 .hgtags
--- a/.hgtags	Mon Dec 26 10:59:36 2011 -0500
+++ b/.hgtags	Mon Dec 26 11:04:52 2011 -0500
@@ -67,3 +67,6 @@
 67a96ebdac744cc4809e821cf98535077024f948 2011.0.0
 3d9649aa241ae45fcdcf7cde1265a85820fef6e9 2011.2.0_rc5
 3d9649aa241ae45fcdcf7cde1265a85820fef6e9 2011.2.0
+4ddbc0de5115b7ac2010f34d0e2ee3530234862e 2011.4beta1
+cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0_rc1
+cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0
diff -r c4c76a7dfdd5 -r 299352c42973 CMakeLists.txt
--- a/CMakeLists.txt	Mon Dec 26 10:59:36 2011 -0500
+++ b/CMakeLists.txt	Mon Dec 26 11:04:52 2011 -0500
@@ -40,7 +40,7 @@
 
 # version
 set(V_MAJOR 2011)
-set(V_MINOR 3)
+set(V_MINOR 5)
 set(V_PATCH 0)
 
 #
@@ -287,6 +287,7 @@
 
 FIND_PACKAGE(Threads)
 FIND_PACKAGE(ZThread)
+FIND_PACKAGE(flann)
 
 IF(WIN32)
   # HTML Helpworkshop for creating help file
diff -r c4c76a7dfdd5 -r 299352c42973 CMakeModules/Findflann.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CMakeModules/Findflann.cmake	Mon Dec 26 11:04:52 2011 -0500
@@ -0,0 +1,25 @@
+# Search for flann library
+# Copyright (C) 2011 Andreas Metzler. Public Domain
+
+# Search for locally install flann library, fall back to copy in
+# src/foreign otherwise.
+# Sets these variables:
+# FLANN_INCLUDE_DIRS
+# FLANN_LIBRARIES
+# FLANN_FOUND
+
+
+find_path(FLANN_INCLUDE_DIRS flann/flann.hpp)
+
+if(FLANN_INCLUDE_DIRS)
+  find_library(FLANN_LIBRARIES flann_cpp)
+  if(FLANN_LIBRARIES)
+    MESSAGE(STATUS "flann library found")
+    set(FLANN_FOUND "YES")
+  endif(FLANN_LIBRARIES)
+else(FLANN_INCLUDE_DIRS)
+  message(STATUS "flann library not found. falling back to included copy")
+  set(FLANN_LIBRARIES "flann_cpp")
+  set(FLANN_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/foreign")
+endif(FLANN_INCLUDE_DIRS)
+
diff -r c4c76a7dfdd5 -r 299352c42973 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Mon Dec 26 10:59:36 2011 -0500
+++ b/CMakeModules/win_bundle.cmake	Mon Dec 26 11:04:52 2011 -0500
@@ -164,28 +164,28 @@
     )
     # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space
     FIND_FILE(WXWIDGETS_DLL1 
-              NAMES wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
+              NAMES wxbase293u_vc_custom.dll wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL2 
-              NAMES wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
+              NAMES wxmsw293u_core_vc_custom.dll wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL3 
-              NAMES wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
+              NAMES wxmsw293u_xrc_vc_custom.dll wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL4 
-              NAMES wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
+              NAMES wxmsw293u_adv_vc_custom.dll wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL5 
-              NAMES wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
+              NAMES wxmsw293u_gl_vc_custom.dll wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL6 
-              NAMES wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
+              NAMES wxmsw293u_html_vc_custom.dll wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL7 
-              NAMES wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
+              NAMES wxbase293u_xml_vc_custom.dll wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL8 
-              NAMES wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
+              NAMES wxmsw293u_aui_vc_custom.dll wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
 
     INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL} 
diff -r c4c76a7dfdd5 -r 299352c42973 doc/PTBatcherGUI.pod
--- a/doc/PTBatcherGUI.pod	Mon Dec 26 10:59:36 2011 -0500
+++ b/doc/PTBatcherGUI.pod	Mon Dec 26 11:04:52 2011 -0500
@@ -26,10 +26,6 @@
 
 Run batch projects in parallel
 
-=item B<-d|--delete>
-
-Delete *.pto files after stitching
-
 =item B<-o|--overwrite>
 
 Overwrite previous files without asking
@@ -42,8 +38,12 @@
 
 Show verbose output when processing projects
 
+=item B<-a|--assistant>
+
+Run the assistant on the given projects
+
 =back
 
 =head1 AUTHORS
 
-Written by Pablo d'Angelo, Marko Kuder and others.
+Written by Pablo d'Angelo, Marko Kuder, Thomas Modes and others.
diff -r c4c76a7dfdd5 -r 299352c42973 doc/pto_gen.pod
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/pto_gen.pod	Mon Dec 26 11:04:52 2011 -0500
@@ -0,0 +1,56 @@
+=head1 NAME
+
+pto_gen - Generate a Hugin project file from a list of images.
+
+=head1 SYNOPSIS
+
+B<pto_gen> [options] I<image> [...]
+
+=head1 DESCRIPTION
+
+B<pto_gen> assembles a Hugin .pto project file that is suitable as input for
+further tools such as the B<cpfind> control-point generator, or for opening
+with the Hugin panorama GUI itself.  Functionality is similar to
+B<match-n-shift>.
+
+=head1 USAGE
+
+   pto_gen *.jpg
+
+This creates a project file from all jpg images, in the same folder as the
+first photo. The project file is named first_file-last_file.pto using the same
+convention as the Hugin GUI. 
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o|--output> I<file>
+
+Output Hugin PTO file.
+
+=item B<-p|--projection> I<num>
+
+Projection type (default: 0)
+
+=item B<-f|--fov> I<float>
+
+Horizontal field of view of images (default: 50)
+
+=item B<-s|--stacklength> I<num>
+
+Number of images in stack (default: 1, no stacks)
+
+=item B<-l|--linkstacks>
+
+Link image positions in stacks
+
+=item B<-h|--help>
+
+shows help
+
+=back
+
+=head1 AUTHORS
+
+Thomas Modes
diff -r c4c76a7dfdd5 -r 299352c42973 doc/releases/hugin-2011.4.0.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.4.0.txt	Mon Dec 26 11:04:52 2011 -0500
@@ -0,0 +1,149 @@
+Hugin-2011.4 RELEASE NOTES
+
+ABOUT
+
+Hugin is more than just a panorama stitcher. 
+
+Hugin can be found at
+* SourceForge:  http://hugin.sourceforge.net/
+* Launchpad:    https://launchpad.net/hugin
+
+
+DOWNLOAD
+
+The 2011.4 source tarball can be downloaded
+
+* from SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-2011.4.0.tar.bz2/download
+
+* from Launchpad at
+http://launchpad.net/hugin/2011.4/2011.4.0/+download/hugin-2011.4.0.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset cf9be9344356 in our Mercurial
+repository, where it is also tagged 2011.4.0
+
+Verify its SHA1SUM
+89f6ea1f10fae589357bb51581008d7e8e66ed82  hugin-2011.4.0.tar.bz2
+
+EXECUTABLES
+
+Users communities produce executables for their respective platforms.
+
+These executables are then added to the download section on SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+
+CHANGES SINCE 2011.2.0
+
+Hugin has got a vertical feature detection tool for automatic levelling
+of panoramas. Beside this also many bugs have fixed and many general
+improvements have been made.
+
+
+Vertical feature detection tool
+
+Often a panorama, created from several single photos, is not level. In
+this case the experienced user adds vertical and horizontal control
+points to level the panorama.
+
+With this release Hugin introduces a tool named /linefind/ which
+automatically detects vertical features in the photos such as the edges
+of buildings and windows, and assigns vertical control points to them.
+This makes it easier than before to level a panorama, in most cases it
+works without any intervention.
+
+
+Other Improvements
+
+  * The Fast Preview window can now show composition guides such as
+    Rule of Thirds and Golden ratio to support an easier composition
+    of the final panorama.
+  * The output of High Dynamic Range (HDR) images has been modified to
+    prevent clipping of the exposure in EXR format images. The
+    previous versions of Hugin outputted HDR images with absolute
+    exposure values, now with this 2011.4.0 release, Hugin uses relative
+    exposure values. This means that the output Exposure Value (EV) of
+    the panorama, which can be set in the preview window, has an
+    influence on the HDR output (as already for normal LDR images) and
+    should be set to the medium exposure value of the images. If you set
+    the output exposure value to zero, the old behavior is restored.
+  * The batch processor PTBatcherGUI has been extended:
+      o It is now possible to directly add unaligned projects to the
+        assistant queue for aligning and control point generation.
+      o Successfully stitched projects can be automatically removed from
+        the queue, this makes the queue management easier.
+      o If a project was successfully finished by the assistant, it can
+        be automatically added to the stitching queue. This now allows
+        for a fully automatic panorama creation workflow.
+  * Many more improvements and bug fixes.
+
+
+UPGRADING
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommeded to set the default control point detector to
+Hugin's CPFind.  It is the only control point generator endorsed by Hugin.
+Third-party generators may be compatible with the plug-in architecture.
+
+
+COMPILING
+
+Users compiling from source refer to the dependencies listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
+
+and the build processes listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+More information in the README and INSTALL_cmake files in the tarball.
+
+
+KNOWN ISSUES AND WORKAROUNDS
+
+Panosphere Overview window seperated from the content
+https://bugs.launchpad.net/hugin/+bug/726997
+
+
+There is a known problem building Hugin with CMake 2.8.5rc2.
+Workaround: Upgrade to a newer CMake version.
+
+
+Mac OS X Users at Tiger and Lion: this version of Hugin contains an openMP enabled 
+enblend and enfuse. These versions don't run on Tiger and currently not on Lion either. 
+Please use the Tiger-compatible enblend and enfuse from the enblend-enfuse-4.0 folder 
+in this dmg. You can specify alternative "external" enblend and enfuse from the Programs 
+pane in the preferences after installing these special version by following the instructions 
+in the README in the enblend-enfuse-4.0 folder. 
+https://bugs.launchpad.net/hugin/+bug/814280
+
+An updated list of issues deemed to be critical, including discussions
+and workarounds is in the issue tracker.
+https://bugs.launchpad.net/hugin/+bugs?search=Search&field.importance=Critical
+
+
+THANKS
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin
+
+
+CHANGELOG
+
+A detailed changelog can be found in the file Changelog.
\ No newline at end of file
diff -r c4c76a7dfdd5 -r 299352c42973 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Mon Dec 26 10:59:36 2011 -0500
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Mon Dec 26 11:04:52 2011 -0500
@@ -74,6 +74,7 @@
 				733DF684117F24ED002EC787 /* PBXTargetDependency */,
 				73FC2AF6110057CB00EAB009 /* PBXTargetDependency */,
 				73FC2AF8110057CB00EAB009 /* PBXTargetDependency */,
+				7377D70F148FD6EE004FE48D /* PBXTargetDependency */,
 				733DF686117F2531002EC787 /* PBXTargetDependency */,
 				E8A7DD8A10FCB38800839DF3 /* PBXTargetDependency */,
 				73FC2AFA110057CB00EAB009 /* PBXTargetDependency */,
@@ -1114,6 +1115,32 @@
 		7377C70A10641769002EF919 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		7377C70B10641769002EF919 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		7377C7441064212B002EF919 /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; };
+		7377D6C6148FD612004FE48D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		7377D6C7148FD612004FE48D /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		7377D6C8148FD612004FE48D /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		7377D6C9148FD612004FE48D /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		7377D6CA148FD612004FE48D /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		7377D6CB148FD612004FE48D /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		7377D6CC148FD612004FE48D /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		7377D6CD148FD612004FE48D /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		7377D6CE148FD612004FE48D /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		7377D6CF148FD612004FE48D /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		7377D6D0148FD612004FE48D /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		7377D6D1148FD612004FE48D /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		7377D6D2148FD612004FE48D /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		7377D6D3148FD612004FE48D /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		7377D6D4148FD612004FE48D /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		7377D6D5148FD612004FE48D /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
+		7377D6D6148FD612004FE48D /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		7377D6D7148FD612004FE48D /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		7377D6D8148FD612004FE48D /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		7377D6D9148FD612004FE48D /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		7377D6DA148FD612004FE48D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		7377D6DB148FD612004FE48D /* libexiv2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98310FB69FC00839DF3 /* libexiv2.dylib */; };
+		7377D709148FD689004FE48D /* pto_gen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D708148FD689004FE48D /* pto_gen.cpp */; };
+		7377D716148FDA70004FE48D /* LayerStacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D715148FDA70004FE48D /* LayerStacks.cpp */; };
+		7377D717148FDA70004FE48D /* LayerStacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D715148FDA70004FE48D /* LayerStacks.cpp */; };
+		7377D74D148FE48A004FE48D /* pto_gen in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7377D6E0148FD612004FE48D /* pto_gen */; };
 		737C8C27139A6ECB00F82635 /* LensTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737C8C25139A6ECB00F82635 /* LensTools.cpp */; };
 		737C8C28139A6ECB00F82635 /* LensTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 737C8C26139A6ECB00F82635 /* LensTools.h */; };
 		737C8CA5139A726C00F82635 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */; };
@@ -2891,6 +2918,27 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		7377D6C0148FD612004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		7377D6C2148FD612004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		7377D70E148FD6EE004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7377D6BE148FD612004FE48D /* pto_gen */;
+			remoteInfo = pto_gen;
+		};
 		737E48B011D3F8C6002BA8AE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -3575,6 +3623,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				7377D74D148FE48A004FE48D /* pto_gen in Copy Executable Files */,
 				73120196141FCA71005071A9 /* linefind in Copy Executable Files */,
 				738A8754126AE53A00DC20B6 /* autooptimiser in Copy Executable Files */,
 				738A8756126AE53A00DC20B6 /* celeste_standalone in Copy Executable Files */,
@@ -4363,6 +4412,9 @@
 		7368E4631083ABF200519ED0 /* NumTransDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumTransDialog.cpp; sourceTree = "<group>"; };
 		736945F5126A235E00BD9B27 /* Hugin-Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Hugin-Info copy 2.plist"; path = "../mac/Hugin-Info copy 2.plist"; sourceTree = "<group>"; };
 		736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; };
+		7377D6E0148FD612004FE48D /* pto_gen */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_gen; sourceTree = BUILT_PRODUCTS_DIR; };
+		7377D708148FD689004FE48D /* pto_gen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto_gen.cpp; sourceTree = "<group>"; };
+		7377D715148FDA70004FE48D /* LayerStacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerStacks.cpp; path = algorithms/basic/LayerStacks.cpp; sourceTree = "<group>"; };
 		737C2238126DB73A0096DB59 /* Hugin-Info copy 3.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Hugin-Info copy 3.plist"; path = "../mac/Hugin-Info copy 3.plist"; sourceTree = "<group>"; };
 		737C228A126DB7580096DB59 /* PTBatcherGUI-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info copy.plist"; sourceTree = "<group>"; };
 		737C8C25139A6ECB00F82635 /* LensTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LensTools.cpp; sourceTree = "<group>"; };
@@ -5298,6 +5350,35 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		7377D6C5148FD612004FE48D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7377D6C6148FD612004FE48D /* libz.dylib in Frameworks */,
+				7377D6C7148FD612004FE48D /* libpng.dylib in Frameworks */,
+				7377D6C8148FD612004FE48D /* libtiff.dylib in Frameworks */,
+				7377D6C9148FD612004FE48D /* libjpeg.dylib in Frameworks */,
+				7377D6CA148FD612004FE48D /* libIex.dylib in Frameworks */,
+				7377D6CB148FD612004FE48D /* libIlmThread.dylib in Frameworks */,
+				7377D6CC148FD612004FE48D /* libIlmImf.dylib in Frameworks */,
+				7377D6CD148FD612004FE48D /* libImath.dylib in Frameworks */,
+				7377D6CE148FD612004FE48D /* libHalf.dylib in Frameworks */,
+				7377D6CF148FD612004FE48D /* libpano13.dylib in Frameworks */,
+				7377D6D0148FD612004FE48D /* libboost_thread.dylib in Frameworks */,
+				7377D6D1148FD612004FE48D /* libboost_date_time.dylib in Frameworks */,
+				7377D6D2148FD612004FE48D /* libboost_filesystem.dylib in Frameworks */,
+				7377D6D3148FD612004FE48D /* libboost_iostreams.dylib in Frameworks */,
+				7377D6D4148FD612004FE48D /* libboost_regex.dylib in Frameworks */,
+				7377D6D5148FD612004FE48D /* libboost_signals.dylib in Frameworks */,
+				7377D6D6148FD612004FE48D /* libboost_system.dylib in Frameworks */,
+				7377D6D7148FD612004FE48D /* libexpat.dylib in Frameworks */,
+				7377D6D8148FD612004FE48D /* HuginVigraImpex.framework in Frameworks */,
+				7377D6D9148FD612004FE48D /* HuginBase.framework in Frameworks */,
+				7377D6DA148FD612004FE48D /* libiconv.dylib in Frameworks */,
+				7377D6DB148FD612004FE48D /* libexiv2.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		737E48B511D3F8C6002BA8AE /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -6164,6 +6245,7 @@
 				5796FA950C4395CC006B7C6E /* nona */,
 				733DF63F117F2268002EC787 /* pano_modify */,
 				733DF66E117F2384002EC787 /* pto_merge */,
+				7377D6E0148FD612004FE48D /* pto_gen */,
 				E8A7D9BA10FB6F5A00839DF3 /* pto2mk */,
 				E8A7D9B710FB6F5A00839DF3 /* pano_trafo */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
@@ -6264,6 +6346,7 @@
 		57460AB30C4E7BD5004507F7 /* tools */ = {
 			isa = PBXGroup;
 			children = (
+				7377D708148FD689004FE48D /* pto_gen.cpp */,
 				73E7D412141FBEA700A6C583 /* linefind.cpp */,
 				7396E473126980F80096D1B3 /* checkpto.cpp */,
 				73BBCD38117E2D3600E37B36 /* pto_merge.cpp */,
@@ -6966,6 +7049,7 @@
 		57EA83990C3A7A9500E4965E /* basic */ = {
 			isa = PBXGroup;
 			children = (
+				7377D715148FDA70004FE48D /* LayerStacks.cpp */,
 				73F54BA0129809A000141773 /* TranslatePanorama.h */,
 				73F54BA1129809A000141773 /* TranslatePanorama.cpp */,
 				7318CA64119D371100DBD6FD /* CalculateOverlap.h */,
@@ -8924,6 +9008,24 @@
 			productReference = 7364217010763A22000121C5 /* deghosting_mask */;
 			productType = "com.apple.product-type.tool";
 		};
+		7377D6BE148FD612004FE48D /* pto_gen */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7377D6DC148FD612004FE48D /* Build configuration list for PBXNativeTarget "pto_gen" */;
+			buildPhases = (
+				7377D6C3148FD612004FE48D /* Sources */,

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/c4c76a7dfdd5
changeset:  5715:c4c76a7dfdd5
user:       Yuval Levy <yuv@...>
date:       Mon Dec 26 10:59:36 2011 -0500
description:

Make Hugin aware of existing preference files from different Hugin versions
Use the framework around line 250 of huginApp.cpp to implement upgrades
and to notify the user of changes.

diffstat:

 src/hugin1/hugin/huginApp.cpp |  99 ++++++++++++++++++++++++++++++------------
 src/hugin1/hugin/huginApp.h   |   4 +-
 2 files changed, 73 insertions(+), 30 deletions(-)

diffs (217 lines):

diff -r eae49ac5569a -r c4c76a7dfdd5 src/hugin1/hugin/huginApp.cpp
--- a/src/hugin1/hugin/huginApp.cpp	Sat Oct 08 11:34:28 2011 +0200
+++ b/src/hugin1/hugin/huginApp.cpp	Mon Dec 26 10:59:36 2011 -0500
@@ -64,6 +64,15 @@
 
 #include "AboutDialog.h"
 
+#include <hugin_version.h>
+//for natural sorting
+#include "hugin_utils/alphanum.h"
+
+bool checkVersion(wxString v1, wxString v2)
+{
+    return doj::alphanum_comp(std::string(v1.mb_str(wxConvLocal)),std::string(v2.mb_str(wxConvLocal))) < 0;
+};
+
 using namespace hugin_utils;
 
 // utility functions
@@ -206,14 +215,14 @@
     }
 
     // here goes and comes configuration
-    wxConfigBase * config = wxConfigBase::Get();
+    wxConfigBase * cfg = wxConfigBase::Get();
     // do not record default values in the preferences file
-    config->SetRecordDefaults(false);
+    cfg->SetRecordDefaults(false);
 
-    config->Flush();
+    cfg->Flush();
 
     // initialize i18n
-    int localeID = config->Read(wxT("language"), (long) HUGIN_LANGUAGE);
+    int localeID = cfg->Read(wxT("language"), (long) HUGIN_LANGUAGE);
     DEBUG_TRACE("localeID: " << localeID);
     {
         bool bLInit;
@@ -230,6 +239,38 @@
     // set the name of locale recource to look for
     locale.AddCatalog(wxT("hugin"));
 
+    /**
+ *  Here we check the version of the preferences stored on the computer against the version of the Hugin binary.
+ *  Please notify the user here of important changes.
+ *  You can also implement changes such as new preferences, but please notify the user / give him the possibility
+ *  to abort before making changes.  Prevent surprises.
+ */
+    // read version number of last Hugin binary to use these preferences
+    m_Version = cfg->Read(wxT("/version"),wxT(""));
+
+    // upgrade
+    if (checkVersion(m_Version,wxT(HUGIN_API_VERSION)))
+    {
+
+      wxString text = wxString::Format(_("I am Hugin version %s.  I have found preferences from an older version %s.  I might not be compatible with the older preferences.  If you experience malfunction, please go to the menu  File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),m_Version.c_str());
+
+      wxMessageBox(text, _("Warning"));
+
+      cfg->Write(wxT("/version"), wxT(HUGIN_API_VERSION));     
+      cfg->Flush();
+      
+      };
+
+    // downgrade
+    if (checkVersion(wxT(HUGIN_API_VERSION),m_Version))
+    {
+
+      wxString text = wxString::Format(_("I am Hugin version %s.  I have found preferences from a newer version %s.  I might not be compatible with the newer preferences.  If you experience malfunction, please go to the menu  File -> Preference and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),m_Version.c_str());
+
+      wxMessageBox(text, _("Warning"));
+      
+    };
+
     // initialize image handlers
     wxInitAllImageHandlers();
 
@@ -310,7 +351,7 @@
 
     wxString cwd = wxFileName::GetCwd();
 
-    m_workDir = config->Read(wxT("tempDir"),wxT(""));
+    m_workDir = cfg->Read(wxT("tempDir"),wxT(""));
     // FIXME, make secure against some symlink attacks
     // get a temp dir
     if (m_workDir == wxT("")) {
@@ -409,7 +450,7 @@
                     // Use the first filename to set actualPath.
                     if (! actualPathSet)
                     {
-                        config->Write(wxT("/actualPath"), file.GetPath());
+                        cfg->Write(wxT("/actualPath"), file.GetPath());
                         actualPathSet = true;
                     }
                 }
@@ -433,7 +474,7 @@
 	if(secondParam.Cmp(_T("-notips"))!=0)
 	{
 		//load tip startup preferences (tips will be started after splash terminates)
-		int nValue = config->Read(wxT("/MainFrame/ShowStartTip"), 1l);
+		int nValue = cfg->Read(wxT("/MainFrame/ShowStartTip"), 1l);
 
 		//show tips if needed now
 		if(nValue > 0)
@@ -517,7 +558,7 @@
 {
     DEBUG_TRACE(basename.mb_str(wxConvLocal));
 
-    wxConfigBase * config = wxConfigBase::Get();
+    wxConfigBase * cfg = wxConfigBase::Get();
 
     // get display size
     int dx,dy;
@@ -527,37 +568,37 @@
 // restoring the splitter positions properly when maximising doesn't work.
 // Disabling maximise on wxWidgets >= 2.6.0 and gtk
         //size
-        int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
-        int h = config->Read(wxT("/") + basename + wxT("/height"),-1l);
+        int w = cfg->Read(wxT("/") + basename + wxT("/width"),-1l);
+        int h = cfg->Read(wxT("/") + basename + wxT("/height"),-1l);
         if (w > 0 && w <= dx) {
             frame->SetClientSize(w,h);
         } else {
             frame->Fit();
         }
         //position
-        int x = config->Read(wxT("/") + basename + wxT("/positionX"),-1l);
-        int y = config->Read(wxT("/") + basename + wxT("/positionY"),-1l);
+        int x = cfg->Read(wxT("/") + basename + wxT("/positionX"),-1l);
+        int y = cfg->Read(wxT("/") + basename + wxT("/positionY"),-1l);
         if ( y >= 0 && x >= 0 && x < dx && y < dy) {
             frame->Move(x, y);
         } else {
             frame->Move(0, 44);
         }
 #else
-    bool maximized = config->Read(wxT("/") + basename + wxT("/maximized"), 0l) != 0;
+    bool maximized = cfg->Read(wxT("/") + basename + wxT("/maximized"), 0l) != 0;
     if (maximized) {
         frame->Maximize();
 	} else {
         //size
-        int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
-        int h = config->Read(wxT("/") + basename + wxT("/height"),-1l);
+        int w = cfg->Read(wxT("/") + basename + wxT("/width"),-1l);
+        int h = cfg->Read(wxT("/") + basename + wxT("/height"),-1l);
         if (w > 0 && w <= dx) {
             frame->SetClientSize(w,h);
         } else {
             frame->Fit();
         }
         //position
-        int x = config->Read(wxT("/") + basename + wxT("/positionX"),-1l);
-        int y = config->Read(wxT("/") + basename + wxT("/positionY"),-1l);
+        int x = cfg->Read(wxT("/") + basename + wxT("/positionX"),-1l);
+        int y = cfg->Read(wxT("/") + basename + wxT("/positionY"),-1l);
         if ( y >= 0 && x >= 0 && x < dx && y < dy) {
             frame->Move(x, y);
         } else {
@@ -572,30 +613,30 @@
 {
     DEBUG_TRACE(basename);
 
-    wxConfigBase * config = wxConfigBase::Get();
+    wxConfigBase * cfg = wxConfigBase::Get();
 
 #if ( __WXGTK__ ) &&  wxCHECK_VERSION(2,6,0)
 // restoring the splitter positions properly when maximising doesn't work.
 // Disabling maximise on wxWidgets >= 2.6.0 and gtk
     
         wxSize sz = frame->GetClientSize();
-        config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
-        config->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
+        cfg->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
+        cfg->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
         wxPoint ps = frame->GetPosition();
-        config->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
-        config->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
-        config->Write(wxT("/") + basename + wxT("/maximized"), 0);
+        cfg->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
+        cfg->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
+        cfg->Write(wxT("/") + basename + wxT("/maximized"), 0);
 #else
     if ( (! frame->IsMaximized()) && (! frame->IsIconized()) ) {
         wxSize sz = frame->GetClientSize();
-        config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
-        config->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
+        cfg->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
+        cfg->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
         wxPoint ps = frame->GetPosition();
-        config->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
-        config->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
-        config->Write(wxT("/") + basename + wxT("/maximized"), 0);
+        cfg->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
+        cfg->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
+        cfg->Write(wxT("/") + basename + wxT("/maximized"), 0);
     } else if (frame->IsMaximized()){
-        config->Write(wxT("/") + basename + wxT("/maximized"), 1l);
+        cfg->Write(wxT("/") + basename + wxT("/maximized"), 1l);
     }
 #endif
 }
diff -r eae49ac5569a -r c4c76a7dfdd5 src/hugin1/hugin/huginApp.h
--- a/src/hugin1/hugin/huginApp.h	Sat Oct 08 11:34:28 2011 +0200
+++ b/src/hugin1/hugin/huginApp.h	Mon Dec 26 10:59:36 2011 -0500
@@ -155,7 +155,9 @@
 
 private:
 
-
+    /** API version */
+    wxString m_Version;
+    
     /** locale for internationalisation */
     wxLocale locale;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a0741066d8f7
changeset:  5714:a0741066d8f7
user:       tmodes
date:       Fri Dec 23 08:35:59 2011 +0100
description:

Use different random generator on newer boost version
mt19937 does crash when used in multi-threading code

diffstat:

 src/hugin_base/photometric/ResponseTransform.h |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 7f0674a26bdb -r a0741066d8f7 src/hugin_base/photometric/ResponseTransform.h
--- a/src/hugin_base/photometric/ResponseTransform.h	Fri Dec 23 08:34:54 2011 +0100
+++ b/src/hugin_base/photometric/ResponseTransform.h	Fri Dec 23 08:35:59 2011 +0100
@@ -26,7 +26,14 @@
 
 #include <vector>
 #include <functional>
+#include <boost/version.hpp>
+#if BOOST_VERSION>104700
+#include <boost/random/taus88.hpp>
+#define RANDOMGENERATOR boost::random::taus88
+#else
 #include <boost/random/mersenne_twister.hpp>
+#define RANDOMGENERATOR boost::mt19937
+#endif
 
 #include <vigra/stdimage.hxx>
 #include <vigra/numerictraits.hxx>
@@ -234,7 +241,7 @@
         double m_intScale;
         
     private:
-        boost::mt19937 Twister;
+        RANDOMGENERATOR Twister;
 };
 
 
@@ -456,7 +463,7 @@
 template <class VTIn, class VTOut>
 double InvResponseTransform<VTIn,VTOut>::dither(const double &v) const
 {
-    boost::mt19937 &mt = const_cast<boost::mt19937 &>(Twister);
+    RANDOMGENERATOR &mt = const_cast<RANDOMGENERATOR &>(Twister);
     double vFraction = v - floor(v);
     // Only dither values within a certain range of the rounding cutoff point.
     if (vFraction > 0.25 && vFraction <= 0.75) {

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/7f0674a26bdb
changeset:  5713:7f0674a26bdb
user:       tmodes
date:       Fri Dec 23 08:34:54 2011 +0100
description:

Add namespace to compile with Boost 1.48

diffstat:

 src/hugin_base/algorithms/optimizer/ImageGraph.cpp |  4 ++--
 src/hugin_base/algorithms/optimizer/PTOptimizer.h  |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp	Fri Dec 23 08:34:18 2011 +0100
+++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp	Fri Dec 23 08:34:54 2011 +0100
@@ -55,7 +55,7 @@
 
         CPGraphIndexMap index = get(boost::vertex_index, graph);
         bool found=false;
-        for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
+        for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
              ai != ai_end; ++ai)
         {
             if (index[*ai] == it->image2Nr) found = true;
@@ -83,7 +83,7 @@
 
                 CPGraphIndexMap index = get(boost::vertex_index, graph);
                 bool found=false;
-                for (tie(ai, ai_end) = adjacent_vertices(i, graph);
+                for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
                      ai != ai_end; ++ai)
                 {
                     if (index[*ai] == j) found = true;
diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h	Fri Dec 23 08:34:18 2011 +0100
+++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h	Fri Dec 23 08:34:54 2011 +0100
@@ -233,7 +233,7 @@
     // collect all optimized neighbours
     typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
     typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
-    for (tie(ai, ai_end) = adjacent_vertices(v, g);
+    for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
          ai != ai_end; ++ai)
     {
         if (*ai != v) {

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/923ddde5649d
changeset:  5711:923ddde5649d
user:       tmodes
date:       Fri Dec 23 08:33:58 2011 +0100
description:

Save splitter position in failed projects dialogs

diffstat:

 src/hugin1/hugin/xrc/batch_frame.xrc          |  2 +-
 src/hugin1/ptbatcher/FailedProjectsDialog.cpp |  8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 5c74334befc3 -r 923ddde5649d src/hugin1/hugin/xrc/batch_frame.xrc
--- a/src/hugin1/hugin/xrc/batch_frame.xrc	Fri Dec 23 08:33:29 2011 +0100
+++ b/src/hugin1/hugin/xrc/batch_frame.xrc	Fri Dec 23 08:33:58 2011 +0100
@@ -311,7 +311,7 @@
         <object class="wxBoxSizer">
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
-            <object class="wxSplitterWindow">
+            <object class="wxSplitterWindow" name="failed_splitter">
               <object class="wxPanel">
                 <object class="wxStaticBoxSizer">
                   <label>Failed projects</label>
diff -r 5c74334befc3 -r 923ddde5649d src/hugin1/ptbatcher/FailedProjectsDialog.cpp
--- a/src/hugin1/ptbatcher/FailedProjectsDialog.cpp	Fri Dec 23 08:33:29 2011 +0100
+++ b/src/hugin1/ptbatcher/FailedProjectsDialog.cpp	Fri Dec 23 08:33:58 2011 +0100
@@ -85,6 +85,13 @@
         {
             this->Fit();
         }
+        //splitter position
+        int splitter_pos=config->Read(wxT("/FailedProjectsDialog/splitterPos"),-1l);
+        wxSplitterWindow* splitWindow=XRCCTRL(*this,"failed_splitter",wxSplitterWindow);
+        if(splitter_pos>0 && splitter_pos<splitWindow->GetSize().GetWidth())
+        {
+            splitWindow->SetSashPosition(splitter_pos);
+        };
         //position
         int x = config->Read(wxT("/FailedProjectsDialog/positionX"),-1l);
         int y = config->Read(wxT("/FailedProjectsDialog/positionY"),-1l);
@@ -116,6 +123,7 @@
     {
         config->Write(wxT("/FailedProjectsDialog/maximized"), 1l);
     };
+    config->Write(wxT("/FailedProjectsDialog/splitterPos"), XRCCTRL(*this,"failed_splitter",wxSplitterWindow)->GetSashPosition());
 };
 
 void FailedProjectsDialog::OnSelectProject(wxCommandEvent& e)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/5c74334befc3
changeset:  5710:5c74334befc3
user:       tmodes
date:       Fri Dec 23 08:33:29 2011 +0100
description:

Updated files, which should be installed, for wxWidgets 2.9.3 [Windows only]

diffstat:

 CMakeModules/win_bundle.cmake |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r 1a49d9a6fa25 -r 5c74334befc3 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Thu Dec 22 23:02:20 2011 +0000
+++ b/CMakeModules/win_bundle.cmake	Fri Dec 23 08:33:29 2011 +0100
@@ -164,28 +164,28 @@
     )
     # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space
     FIND_FILE(WXWIDGETS_DLL1 
-              NAMES wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
+              NAMES wxbase293u_vc_custom.dll wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL2 
-              NAMES wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
+              NAMES wxmsw293u_core_vc_custom.dll wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL3 
-              NAMES wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
+              NAMES wxmsw293u_xrc_vc_custom.dll wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL4 
-              NAMES wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
+              NAMES wxmsw293u_adv_vc_custom.dll wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL5 
-              NAMES wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
+              NAMES wxmsw293u_gl_vc_custom.dll wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL6 
-              NAMES wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
+              NAMES wxmsw293u_html_vc_custom.dll wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL7 
-              NAMES wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
+              NAMES wxbase293u_xml_vc_custom.dll wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL8 
-              NAMES wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
+              NAMES wxmsw293u_aui_vc_custom.dll wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
 
     INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL}

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b873e1da31f0
changeset:  5712:b873e1da31f0
user:       tmodes
date:       Fri Dec 23 08:34:18 2011 +0100
description:

Check for failed projects before displaying dialog

diffstat:

 src/hugin1/ptbatcher/BatchFrame.cpp |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 923ddde5649d -r b873e1da31f0 src/hugin1/ptbatcher/BatchFrame.cpp
--- a/src/hugin1/ptbatcher/BatchFrame.cpp	Fri Dec 23 08:33:58 2011 +0100
+++ b/src/hugin1/ptbatcher/BatchFrame.cpp	Fri Dec 23 08:34:18 2011 +0100
@@ -1079,8 +1079,11 @@
 
 void BatchFrame::OnBatchFailed(wxCommandEvent& event)
 {
-    FailedProjectsDialog failedProjects_dlg(this,m_batch,m_xrcPrefix);
-    failedProjects_dlg.ShowModal();
+    if(m_batch->GetFailedProjectsCount()>0)
+    {
+        FailedProjectsDialog failedProjects_dlg(this,m_batch,m_xrcPrefix);
+        failedProjects_dlg.ShowModal();
+    };
 };
 
 void BatchFrame::OnBatchInformation(wxCommandEvent& e)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/1a49d9a6fa25
changeset:  5709:1a49d9a6fa25
user:       Bruno Postle <bruno@...>
date:       Thu Dec 22 23:02:20 2011 +0000
description:

Update man page

diffstat:

 doc/pto_gen.pod |  8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diffs (18 lines):

diff -r 7fd2f8520cde -r 1a49d9a6fa25 doc/pto_gen.pod
--- a/doc/pto_gen.pod	Thu Dec 22 19:09:49 2011 +0100
+++ b/doc/pto_gen.pod	Thu Dec 22 23:02:20 2011 +0000
@@ -13,6 +13,14 @@
 with the Hugin panorama GUI itself.  Functionality is similar to
 B<match-n-shift>.
 
+=head1 USAGE
+
+   pto_gen *.jpg
+
+This creates a project file from all jpg images, in the same folder as the
+first photo. The project file is named first_file-last_file.pto using the same
+convention as the Hugin GUI. 
+
 =head1 OPTIONS
 
 =over

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/7fd2f8520cde
changeset:  5708:7fd2f8520cde
user:       tmodes
date:       Thu Dec 22 19:09:49 2011 +0100
description:

Workaround for reading LensModel tag for exiv2 <0.22

diffstat:

 src/hugin_base/panodata/SrcPanoImage.cpp |  20 ++++++++++++++++++++
 src/hugin_base/panodata/SrcPanoImage.h   |   1 +
 2 files changed, 21 insertions(+), 0 deletions(-)

diffs (49 lines):

diff -r 492ed32aa31d -r 7fd2f8520cde src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Tue Dec 20 18:50:21 2011 +0100
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Thu Dec 22 19:09:49 2011 +0100
@@ -372,7 +372,12 @@
     // first we are reading LensModel in Exif section, this is only available
     // with EXIF >= 2.3
     std::string lensName;
+#if EXIV2_TEST_VERSION(0,22,0)
+    //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
     if(getExiv2Value(exifData,"Exif.Photo.LensModel",lensName))
+#else
+    if(getExiv2Value(exifData,0xa434,"Photo",lensName))
+#endif
     {
         if(lensName.length()>0)
         {
@@ -802,6 +807,21 @@
     }
 }
 
+bool SrcPanoImage::getExiv2Value(Exiv2::ExifData& exifData, uint16_t tagID, std::string groupName, std::string & value)
+{
+    Exiv2::ExifKey key(tagID,groupName);
+    Exiv2::ExifData::iterator itr = exifData.findKey(key);
+    if (itr != exifData.end() && itr->count())
+    {
+        value = itr->toString();
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
 // mask handling stuff
 void SrcPanoImage::addMask(MaskPolygon newMask)
 {
diff -r 492ed32aa31d -r 7fd2f8520cde src/hugin_base/panodata/SrcPanoImage.h
--- a/src/hugin_base/panodata/SrcPanoImage.h	Tue Dec 20 18:50:21 2011 +0100
+++ b/src/hugin_base/panodata/SrcPanoImage.h	Thu Dec 22 19:09:49 2011 +0100
@@ -412,6 +412,7 @@
     bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, long & value);
     bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, float & value);
     bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, std::string & value);
+    bool getExiv2Value(Exiv2::ExifData& exifData, uint16_t tagID, std::string groupName, std::string & value);
 
     /** Check if Exiv orientation tag can be trusted */
     bool trustExivOrientation();

branch:     htdocs
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/9b4e99f534f4
changeset:  325:9b4e99f534f4
user:       harryvanderwolf <hvdwolf@...>
date:       Wed Dec 21 08:20:48 2011 +0100
description:

Update download page

diffstat:

 download/index.shtml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 24d91881df66 -r 9b4e99f534f4 download/index.shtml
--- a/download/index.shtml	Sat Dec 17 11:13:41 2011 +0100
+++ b/download/index.shtml	Wed Dec 21 08:20:48 2011 +0100
@@ -56,7 +56,7 @@
 
       <ul>
         <li>Windows: Official 2011.4.0 <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-32bit_Windows.exe/download">32-bit</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-64bit_Windows.exe/download">64-bit</a>.</li>
-        <li>Mac: Official <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2/hugin-mac-2011.2.0.dmg/download">Hugin, PTBatcherGui and Calibrate_lens_gui 2011.2.0</a>. For Tiger(*), Leopard, Snow Leopard and Lion(*). (*): Read the "Read Me First (Mac)" in the dmg.</li>
+        <li>Mac: Official Hugin, PTBatcherGui and Calibrate_lens_gui 2011.2.0: <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0-installer.dmg/download">Installer</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-mac-2011.4.0.dmg/download">a dmg simply containing the bundles</a>. For Tiger, Leopard, Snow Leopard and Lion. <i>Tiger and Lion users <strong>must</strong> read the "Read Me First (Mac)" in the dmg</i>.</li>
         <li>Linux: use your distribution's official package manager.
           <ul>
             <li>Fedora: Instructions for using the Hugin snapshot repository can be found at the <a href="http://wiki.panotools.org/Hugin_Compiling_Fedora">Fedora page on the panotools wiki</a></li>

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/492ed32aa31d
changeset:  5707:492ed32aa31d
user:       tmodes
date:       Tue Dec 20 18:50:21 2011 +0100
description:

Read also LensModel tag (id 0xa434)

diffstat:

 src/hugin_base/panodata/SrcPanoImage.cpp |  31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 69e9c8988e90 -r 492ed32aa31d src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Sat Dec 17 11:27:16 2011 +0100
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Tue Dec 20 18:50:21 2011 +0100
@@ -368,16 +368,35 @@
         setExifModel("Unknown");
     }
 
-    Exiv2::ExifData::const_iterator itr2 = Exiv2::lensName(exifData);
-    if (itr2!=exifData.end())
+    //reading lens
+    // first we are reading LensModel in Exif section, this is only available
+    // with EXIF >= 2.3
+    std::string lensName;
+    if(getExiv2Value(exifData,"Exif.Photo.LensModel",lensName))
     {
-        //we are using prettyPrint function to get string of lens name
-        //it2->toString returns for many cameras only an ID number
-        setExifLens(itr2->print(&exifData));
+        if(lensName.length()>0)
+        {
+            setExifLens(lensName);
+        }
+        else
+        {
+            setExifLens("Unknown");
+        }
     }
     else
     {
-        setExifLens("Unknown");
+        //no lens in Exif found, now look in makernotes
+        Exiv2::ExifData::const_iterator itr2 = Exiv2::lensName(exifData);
+        if (itr2!=exifData.end() && itr2->count())
+        {
+            //we are using prettyPrint function to get string of lens name
+            //it2->toString returns for many cameras only an ID number
+            setExifLens(itr2->print(&exifData));
+        }
+        else
+        {
+            setExifLens("Unknown");
+        };
     };
 
     long orientation = 0;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/69e9c8988e90
changeset:  5706:69e9c8988e90
user:       tmodes
date:       Sat Dec 17 11:27:16 2011 +0100
description:

Updated years

diffstat:

 src/hugin1/hugin/xrc/data/sponsors.htm |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r e5cb8182cfdc -r 69e9c8988e90 src/hugin1/hugin/xrc/data/sponsors.htm
--- a/src/hugin1/hugin/xrc/data/sponsors.htm	Sat Dec 17 11:19:27 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/sponsors.htm	Sat Dec 17 11:27:16 2011 +0100
@@ -11,7 +11,7 @@
       <b>Thanks to our major sponsors:</b>
       </p>
       <ul>
-      <li>Google for the Google Summer of Code 2007, 2008, 2009, 2010.</li>
+      <li>Google for the Google Summer of Code 2007, 2008, 2009, 2010, 2011.</li>
       <li>Agnos for providing pano heads to the Hugin GSoC 2007 participants.</li>
       <li>Nodal Ninja for providing pano heads to the Hugin GSoC 2008 and 2009 participants.</li>
       <li>Last but not least the many members of the Hugin-PTX mailing list.</li>

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e5cb8182cfdc
changeset:  5705:e5cb8182cfdc
user:       tmodes
date:       Sat Dec 17 11:19:27 2011 +0100
description:

Updated release notes

diffstat:

 doc/releases/hugin-2011.4.0.txt |  6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diffs (16 lines):

diff -r 461836fd030f -r e5cb8182cfdc doc/releases/hugin-2011.4.0.txt
--- a/doc/releases/hugin-2011.4.0.txt	Sat Dec 17 11:00:03 2011 +0100
+++ b/doc/releases/hugin-2011.4.0.txt	Sat Dec 17 11:19:27 2011 +0100
@@ -45,12 +45,6 @@
 
 Announce your build on http://groups.google.com/group/hugin-ptx
 
-TRANSLATIONS
-
-This beta releases introduces some new strings.  
-Now is a good time to help update your language.
-Instructions at http://wiki.panotools.org/Hugin_translation_guide 
-
 
 CHANGES SINCE 2011.2.0

branch:     htdocs
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/24d91881df66
changeset:  324:24d91881df66
user:       tmodes
date:       Sat Dec 17 11:13:41 2011 +0100
description:

Updated pages for 2011.4 release

diffstat:

 download/index.shtml |  3 ++-
 index.shtml          |  6 ++++++
 news.html            |  8 ++++++++
 releases/index.shtml |  7 +++++++
 4 files changed, 23 insertions(+), 1 deletions(-)

diffs (77 lines):

diff -r b9b44f238e5d -r 24d91881df66 download/index.shtml
--- a/download/index.shtml	Sun Nov 20 21:09:58 2011 +0000
+++ b/download/index.shtml	Sat Dec 17 11:13:41 2011 +0100
@@ -23,6 +23,7 @@
 
       <p>For detailed release notes, see the <a href="../releases/">Hugin releases</a> section.</p>
       <ul>
+        <li>2011.4.0 released December 2011</li>
         <li>2011.2.0 released September 2011</li>
         <li>2011.0.0 released May 2011</li>
         <li>2010.4.0 released December 2010, with the addition of CPfind Hugin is now <em>feature complete</em>.</li>
@@ -54,7 +55,7 @@
       </p>
 
       <ul>
-        <li>Windows: Official 2011.2.0 <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2/HuginSetup_2011.2.0_32bit_Windows.exe/download">32-bit</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2/HuginSetup_2011.2.0_64bit_Windows.exe/download">64-bit</a>.</li>
+        <li>Windows: Official 2011.4.0 <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-32bit_Windows.exe/download">32-bit</a> and <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/HuginSetup_2011.4.0-64bit_Windows.exe/download">64-bit</a>.</li>
         <li>Mac: Official <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2/hugin-mac-2011.2.0.dmg/download">Hugin, PTBatcherGui and Calibrate_lens_gui 2011.2.0</a>. For Tiger(*), Leopard, Snow Leopard and Lion(*). (*): Read the "Read Me First (Mac)" in the dmg.</li>
         <li>Linux: use your distribution's official package manager.
           <ul>
diff -r b9b44f238e5d -r 24d91881df66 index.shtml
--- a/index.shtml	Sun Nov 20 21:09:58 2011 +0000
+++ b/index.shtml	Sat Dec 17 11:13:41 2011 +0100
@@ -17,12 +17,18 @@
 
       <div class="alert">
 
+        <h2>Hugin 2011.4.0 released! <small>2011-12-17</small></h2>
+        <p class="alert"><a href="releases/2011.4.0/">Release notes...</a>
+        </p>
+
+        <!--
         <h2>Hugin 2011.2.0 released! <small>2011-09-30</small></h2>
         <p class="alert"><a href="releases/2011.2.0/">Release notes...</a>
         [ <a href="releases/2011.2.0/it.shtml">Italiano...</a>
         <a href="releases/2011.2.0/cs.shtml">&#x10C;e&#x161;tina...</a>
         <a href="releases/2011.2.0/de.shtml">Deutsch...</a>  ]
         </p>
+        -->
 
         <!--
         <h2>Hugin 2011.0.0 released! <small>2011-05-29</small></h2>
diff -r b9b44f238e5d -r 24d91881df66 news.html
--- a/news.html	Sun Nov 20 21:09:58 2011 +0000
+++ b/news.html	Sat Dec 17 11:13:41 2011 +0100
@@ -8,6 +8,14 @@
 <!-- other news is also relevant, feel free to add anything Hugin related -->
 
 <p><strong>
+Hugin-2011.4.0 released
+</strong><small class="date">
+2011-12-17
+</small><br />
+Hugin is more than just a panorama stitcher
+</p>
+
+<p><strong>
 Hugin-2011.2.0 released
 </strong><small class="date">
 2011-09-30
diff -r b9b44f238e5d -r 24d91881df66 releases/index.shtml
--- a/releases/index.shtml	Sun Nov 20 21:09:58 2011 +0000
+++ b/releases/index.shtml	Sat Dec 17 11:13:41 2011 +0100
@@ -12,6 +12,13 @@
 <div class="content">
 <h1>Hugin release notes</h1>
 
+<h2>Hugin 2011.4.0</h2>
+<ul>
+
+<li><a href="2011.4.0/">English release notes</a></li>
+
+</ul>
+
 <h2>Hugin 2011.2.0</h2>
 <ul>

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/461836fd030f
changeset:  5704:461836fd030f
user:       tmodes
date:       Sat Dec 17 11:00:03 2011 +0100
description:

Added tag 2011.4.0 for changeset cf9be9344356

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r d76a6cca3ff1 -r 461836fd030f .hgtags
--- a/.hgtags	Sat Dec 17 10:59:44 2011 +0100
+++ b/.hgtags	Sat Dec 17 11:00:03 2011 +0100
@@ -69,3 +69,4 @@
 3d9649aa241ae45fcdcf7cde1265a85820fef6e9 2011.2.0
 4ddbc0de5115b7ac2010f34d0e2ee3530234862e 2011.4beta1
 cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0_rc1
+cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d76a6cca3ff1
changeset:  5703:d76a6cca3ff1
user:       tmodes
date:       Sat Dec 17 10:59:44 2011 +0100
description:

Added release notes for 2011.4

diffstat:

 doc/releases/hugin-2011.4.0.txt |  155 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 155 insertions(+), 0 deletions(-)

diffs (160 lines):

diff -r 11f10e348bcf -r d76a6cca3ff1 doc/releases/hugin-2011.4.0.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.4.0.txt	Sat Dec 17 10:59:44 2011 +0100
@@ -0,0 +1,155 @@
+Hugin-2011.4 RELEASE NOTES
+
+ABOUT
+
+Hugin is more than just a panorama stitcher. 
+
+Hugin can be found at
+* SourceForge:  http://hugin.sourceforge.net/
+* Launchpad:    https://launchpad.net/hugin
+
+
+DOWNLOAD
+
+The 2011.4 source tarball can be downloaded
+
+* from SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.4/hugin-2011.4.0.tar.bz2/download
+
+* from Launchpad at
+http://launchpad.net/hugin/2011.4/2011.4.0/+download/hugin-2011.4.0.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset cf9be9344356 in our Mercurial
+repository, where it is also tagged 2011.4.0
+
+Verify its SHA1SUM
+89f6ea1f10fae589357bb51581008d7e8e66ed82  hugin-2011.4.0.tar.bz2
+
+EXECUTABLES
+
+Users communities produce executables for their respective platforms.
+
+These executables are then added to the download section on SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+TRANSLATIONS
+
+This beta releases introduces some new strings.  
+Now is a good time to help update your language.
+Instructions at http://wiki.panotools.org/Hugin_translation_guide 
+
+
+CHANGES SINCE 2011.2.0
+
+Hugin has got a vertical feature detection tool for automatic levelling
+of panoramas. Beside this also many bugs have fixed and many general
+improvements have been made.
+
+
+Vertical feature detection tool
+
+Often a panorama, created from several single photos, is not level. In
+this case the experienced user adds vertical and horizontal control
+points to level the panorama.
+
+With this release Hugin introduces a tool named /linefind/ which
+automatically detects vertical features in the photos such as the edges
+of buildings and windows, and assigns vertical control points to them.
+This makes it easier than before to level a panorama, in most cases it
+works without any intervention.
+
+
+Other Improvements
+
+  * The Fast Preview window can now show composition guides such as
+    Rule of Thirds and Golden ratio to support an easier composition
+    of the final panorama.
+  * The output of High Dynamic Range (HDR) images has been modified to
+    prevent clipping of the exposure in EXR format images. The
+    previous versions of Hugin outputted HDR images with absolute
+    exposure values, now with this 2011.4.0 release, Hugin uses relative
+    exposure values. This means that the output Exposure Value (EV) of
+    the panorama, which can be set in the preview window, has an
+    influence on the HDR output (as already for normal LDR images) and
+    should be set to the medium exposure value of the images. If you set
+    the output exposure value to zero, the old behavior is restored.
+  * The batch processor PTBatcherGUI has been extended:
+      o It is now possible to directly add unaligned projects to the
+        assistant queue for aligning and control point generation.
+      o Successfully stitched projects can be automatically removed from
+        the queue, this makes the queue management easier.
+      o If a project was successfully finished by the assistant, it can
+        be automatically added to the stitching queue. This now allows
+        for a fully automatic panorama creation workflow.
+  * Many more improvements and bug fixes.
+
+
+UPGRADING
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommeded to set the default control point detector to
+Hugin's CPFind.  It is the only control point generator endorsed by Hugin.
+Third-party generators may be compatible with the plug-in architecture.
+
+
+COMPILING
+
+Users compiling from source refer to the dependencies listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
+
+and the build processes listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+More information in the README and INSTALL_cmake files in the tarball.
+
+
+KNOWN ISSUES AND WORKAROUNDS
+
+Panosphere Overview window seperated from the content
+https://bugs.launchpad.net/hugin/+bug/726997
+
+
+There is a known problem building Hugin with CMake 2.8.5rc2.
+Workaround: Upgrade to a newer CMake version.
+
+
+Mac OS X Users at Tiger and Lion: this version of Hugin contains an openMP enabled 
+enblend and enfuse. These versions don't run on Tiger and currently not on Lion either. 
+Please use the Tiger-compatible enblend and enfuse from the enblend-enfuse-4.0 folder 
+in this dmg. You can specify alternative "external" enblend and enfuse from the Programs 
+pane in the preferences after installing these special version by following the instructions 
+in the README in the enblend-enfuse-4.0 folder. 
+https://bugs.launchpad.net/hugin/+bug/814280
+
+An updated list of issues deemed to be critical, including discussions
+and workarounds is in the issue tracker.
+https://bugs.launchpad.net/hugin/+bugs?search=Search&field.importance=Critical
+
+
+THANKS
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin
+
+
+CHANGELOG
+
+A detailed changelog can be found in the file Changelog.
\ No newline at end of file

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/11f10e348bcf
changeset:  5702:11f10e348bcf
user:       Bruno Postle <bruno@...>
date:       Sat Dec 17 00:29:17 2011 +0000
description:

Add a Linux GUI context menu item for pto_gen

diffstat:

 src/tools/CMakeLists.txt  |   4 ++++
 src/tools/pto_gen.desktop |  13 +++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diffs (28 lines):

diff -r 71ffba4767f5 -r 11f10e348bcf src/tools/CMakeLists.txt
--- a/src/tools/CMakeLists.txt	Thu Dec 15 19:54:42 2011 +0100
+++ b/src/tools/CMakeLists.txt	Sat Dec 17 00:29:17 2011 +0000
@@ -51,3 +51,7 @@
         tca_correct pto2mk cpclean checkpto hugin_hdrmerge pano_trafo pano_modify pto_merge pto_gen
         DESTINATION ${BINDIR})
 
+IF(UNIX)
+  INSTALL(FILES pto_gen.desktop DESTINATION ${DATADIR}/applications)
+ENDIF(UNIX)
+
diff -r 71ffba4767f5 -r 11f10e348bcf src/tools/pto_gen.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/tools/pto_gen.desktop	Sat Dec 17 00:29:17 2011 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Hugin PTO generator
+Comment=Initialise a Hugin panorama project from multiple photos
+Exec=pto_gen %F
+NoDisplay=true
+Icon=hugin
+Terminal=false
+Type=Application
+Categories=Graphics;
+MimeType=image/tiff;image/jpeg;
+GenericName=Panorama project generator

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/71ffba4767f5
changeset:  5701:71ffba4767f5
user:       tmodes
date:       Thu Dec 15 19:54:42 2011 +0100
description:

Unified line endings

diffstat:

 src/tools/pto_gen.cpp |  44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diffs (54 lines):

diff -r 05cfdbc3251f -r 71ffba4767f5 src/tools/pto_gen.cpp
--- a/src/tools/pto_gen.cpp	Thu Dec 15 19:25:29 2011 +0100
+++ b/src/tools/pto_gen.cpp	Thu Dec 15 19:54:42 2011 +0100
@@ -120,28 +120,28 @@
                 break;
             case 'c':
                 {
-                    int left, right, top, bottom;
-                    int n=sscanf(optarg, "%d,%d,%d,%d", &left, &right, &top, &bottom);
-                    if (n==4)
-                    {
-                        if(right>left && bottom>top && left>=0 && top>=0)
-                        {
-                            cropRect.setUpperLeft(vigra::Point2D(left,top));
-                            cropRect.setLowerRight(vigra::Point2D(right,bottom));
-                        }
-                        else
-                        {
-                            cerr << "Invalid crop area" << endl;
-                            return 1;
-                        };
-                    }
-                    else
-                    {
-                        cerr << "Could not parse crop values" << endl;
-                        return 1;
-                    };
-                };
-                break;
+                    int left, right, top, bottom;
+                    int n=sscanf(optarg, "%d,%d,%d,%d", &left, &right, &top, &bottom);
+                    if (n==4)
+                    {
+                        if(right>left && bottom>top && left>=0 && top>=0)
+                        {
+                            cropRect.setUpperLeft(vigra::Point2D(left,top));
+                            cropRect.setLowerRight(vigra::Point2D(right,bottom));
+                        }
+                        else
+                        {
+                            cerr << "Invalid crop area" << endl;
+                            return 1;
+                        };
+                    }
+                    else
+                    {
+                        cerr << "Could not parse crop values" << endl;
+                        return 1;
+                    };
+                };
+                break;
             case 's':
                 stackLength=atoi(optarg);
                 if(stackLength<1)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/05cfdbc3251f
changeset:  5700:05cfdbc3251f
user:       tmodes
date:       Thu Dec 15 19:25:29 2011 +0100
description:

Several improvements to pto_gen
* Added crop option to command line switches
* Improved parsing of wildcards (Windows only)
* Added some warnings about invalid combinations

diffstat:

 src/tools/pto_gen.cpp |  68 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 7 deletions(-)

diffs (134 lines):

diff -r 8ba13ec648ee -r 05cfdbc3251f src/tools/pto_gen.cpp
--- a/src/tools/pto_gen.cpp	Wed Dec 14 18:47:32 2011 +0100
+++ b/src/tools/pto_gen.cpp	Thu Dec 15 19:25:29 2011 +0100
@@ -51,6 +51,8 @@
          << "     -o, --output=file.pto  Output Hugin PTO file." << endl
          << "     -p, --projection=INT   Projection type (default: 0)" << endl
          << "     -f, --fov=FLOAT        Horizontal field of view of images (default: 50)" << endl
+         << "     -c, --crop=left,right,top,bottom        Sets the crop of input" << endl
+         << "                            images (especially for fisheye lenses)" << endl
          << "     -s, --stacklength=INT  Number of images in stack" << endl
          << "                            (default: 1, no stacks)" << endl
          << "     -l, --linkstacks       Link image positions in stacks" << endl
@@ -61,13 +63,14 @@
 int main(int argc, char* argv[])
 {
     // parse arguments
-    const char* optstring = "o:p:f:s:lh";
+    const char* optstring = "o:p:f:c:s:lh";
 
     static struct option longOptions[] =
     {
         {"output", required_argument, NULL, 'o' },
         {"projection", required_argument, NULL, 'p' },
         {"fov", required_argument, NULL, 'f' },
+        {"crop", required_argument, NULL, 'c' },
         {"stacklength", required_argument, NULL, 's' },
         {"linkstacks", no_argument, NULL, 'l' },
         {"help", no_argument, NULL, 'h' },
@@ -81,6 +84,7 @@
     float fov=-1;
     int stackLength=1;
     bool linkStacks=false;
+    vigra::Rect2D cropRect(0,0,0,0);
     while ((c = getopt_long (argc, argv, optstring, longOptions,&optionIndex)) != -1)
     {
         switch (c)
@@ -114,6 +118,30 @@
                     return 1;
                 };
                 break;
+            case 'c':
+                {
+                    int left, right, top, bottom;
+                    int n=sscanf(optarg, "%d,%d,%d,%d", &left, &right, &top, &bottom);
+                    if (n==4)
+                    {
+                        if(right>left && bottom>top && left>=0 && top>=0)
+                        {
+                            cropRect.setUpperLeft(vigra::Point2D(left,top));
+                            cropRect.setLowerRight(vigra::Point2D(right,bottom));
+                        }
+                        else
+                        {
+                            cerr << "Invalid crop area" << endl;
+                            return 1;
+                        };
+                    }
+                    else
+                    {
+                        cerr << "Could not parse crop values" << endl;
+                        return 1;
+                    };
+                };
+                break;
             case 's':
                 stackLength=atoi(optarg);
                 if(stackLength<1)
@@ -166,12 +194,16 @@
         {
             do
             {
-                _splitpath(finddata.name, NULL, NULL, fname, ext);
-                _makepath(newFile, drive, dir, fname, ext);
-                //check if valid image file
-                if(vigra::isImage(newFile))
+                //ignore folder, can be happen when using *.*
+                if((finddata.attrib & _A_SUBDIR)==0)
                 {
-                    filelist.push_back(std::string(newFile));
+                    _splitpath(finddata.name, NULL, NULL, fname, ext);
+                    _makepath(newFile, drive, dir, fname, ext);
+                    //check if valid image file
+                    if(vigra::isImage(newFile))
+                    {
+                        filelist.push_back(std::string(newFile));
+                    };
                 };
             }
             while (_findnext(findhandle, &finddata) == 0);
@@ -221,10 +253,25 @@
             //set plausible default value if they could not read from exif
             if(!srcImage.hasEXIFread())
             {
+                cout << "\tNo value for field of view found in EXIF data. " << endl
+                     << "\tAssuming a HFOV of 50 degrees. " << endl;
                 srcImage.setHFOV(50);
                 srcImage.setExifCropFactor(1.0);
             };
         };
+        if(cropRect.width()>0 && cropRect.height()>0)
+        {
+            if(srcImage.isCircularCrop())
+            {
+                srcImage.setCropMode(SrcPanoImage::CROP_CIRCLE);
+            }
+            else
+            {
+                srcImage.setCropMode(SrcPanoImage::CROP_RECTANGLE);
+            };
+            srcImage.setAutoCenterCrop(false);
+            srcImage.setCropRect(cropRect);
+        };
         try
         {
             vigra::ImageImportInfo info(filelist[i].c_str());
@@ -291,10 +338,17 @@
             };
         };
         cout << endl << "Assigned " << lenses.getNumberOfParts() << " lenses." << endl;
+        if(lenses.getNumberOfParts()>1 && stackLength>1)
+        {
+            cout << "Project contains more than one lens, but you requested to assign" << endl
+                 << "stacks. This is not supported. Therefore stacks will not be" << endl
+                 << "assigned." << endl << endl;
+            stackLength=1;
+        };
     };
 
     //link stacks
-    if(stackLength>1)
+    if(pano.getNrOfImages()>1 && stackLength>1)
     {
         stackLength=std::min<int>(stackLength,pano.getNrOfImages());
         int stackCount=pano.getNrOfImages() / stackLength;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8ba13ec648ee
changeset:  5699:8ba13ec648ee
user:       tmodes
date:       Wed Dec 14 18:47:32 2011 +0100
description:

pto_gen: Write default output into directory of first image instead of working directory [903968]

diffstat:

 src/tools/pto_gen.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r c884730defe3 -r 8ba13ec648ee src/tools/pto_gen.cpp
--- a/src/tools/pto_gen.cpp	Sun Dec 11 10:41:15 2011 +0100
+++ b/src/tools/pto_gen.cpp	Wed Dec 14 18:47:32 2011 +0100
@@ -333,7 +333,7 @@
     //output
     if(output=="")
     {
-        output=hugin_utils::stripExtension(hugin_utils::stripPath(pano.getImage(0).getFilename()));
+        output=hugin_utils::stripExtension(pano.getImage(0).getFilename());
         if(pano.getNrOfImages()>1)
         {
             output.append("-");

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/c884730defe3
changeset:  5698:c884730defe3
user:       tmodes
date:       Sun Dec 11 10:41:15 2011 +0100
description:

Added help page for pto_gen

diffstat:

 src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html                 |   3 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html |  14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html               |  90 ++++++++++
 src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk          |  10 +
 src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc            |   4 +
 src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp       |   1 +
 src/hugin1/hugin/xrc/data/help_en_EN/pages.txt                  |   1 +
 7 files changed, 116 insertions(+), 7 deletions(-)

diffs (219 lines):

diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html	Sun Dec 11 10:41:15 2011 +0100
@@ -91,6 +91,7 @@
 </li><li> <a href="Tca_correct.html" title="Tca correct">tca_correct</a> a tool to automatically generate <a href="Chromatic_aberration.html" title="Chromatic aberration">chromatic aberration</a> correction parameters for use with <a href="Fulla.html" title="Fulla">fulla</a>.
 </li><li> <a href="MatchPoint.html" title="MatchPoint">matchpoint</a> feature identification.
 </li><li> <a href="Pto2mk.html" title="Pto2mk">pto2mk</a> generation of Makefiles for command-line stitching.
+</li><li> <a href="Pto_gen.html" title="Pto gen">pto_gen</a> command line tool to generate project file from images
 </li><li> <a href="Cpfind.html" title="Cpfind">cpfind</a> command line tool to find control points
 </li><li> <a href="Linefind.html" title="Linefind">linefind</a> command line tool to find vertical features for leveling
 </li><li> <a href="Icpfind.html" title="Icpfind">icpfind</a> command line tool for using heuristic control point matching like inside [[hugin]Hugin GUI]
@@ -140,4 +141,4 @@
 
 <div class="printfooter">
 Retrieved from "<a href="Hugin.html">http://wiki.panotools.org/Hugin</a>"</div>
-			</div></div></div></div></body></html>
\ No newline at end of file
+			</div></div></div></div></body></html>
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html	Sun Dec 11 10:41:15 2011 +0100
@@ -50,7 +50,8 @@
 </p>
 
 <a name="Installation_on_Mac_OS_X" id="Installation_on_Mac_OS_X"></a><h1> <span class="mw-headline"> Installation on Mac OS X </span></h1>
-<p>At least on Mac OS X you have to download and install the BatchProcessor separately. You will find it at the Sourceforge page<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/">[*]</a> inside the folder for the latest version, e.g. ptbatchergui-mac-2011.0.0.dmg<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0/ptbatchergui-mac-2011.0.0.dmg/download">[*]</a>. Just copy the app into the same folder as hugin and run it.
+<p>Versions before the 2011.2.0 series required you to separately download and install the BatchProcessor. You will find the 2011.0.0 and older versions at the <a href="http://sourceforge.net/projects/hugin/files/hugin/" class="external text" title="http://sourceforge.net/projects/hugin/files/hugin/" rel="nofollow">Sourceforge page</a> inside the folder for the latest version, e.g. <a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0/ptbatchergui-mac-2011.0.0.dmg/download" class="external text" title="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0/ptbatchergui-mac-2011.0.0.dmg/download" rel="nofollow">ptbatchergui-mac-2011.0.0.dmg</a>. Just copy the app into the same folder as hugin and run it.
+The compressed disk image (DMGs) versions as of 2011.2.0 and newer contain Hugin, PTBatcherGui and calibrate_lens_gui all in one dmg.
 </p>
 <a name="Usage" id="Usage"></a><h1> <span class="mw-headline"> Usage </span></h1>
 <p>Just create several project files (do everything and just skip the export step), load them in the batch processor and start the process. This way you can run several large projects unattended. The output file name will be the same as the name of the corresponding project file (xyz.pto -&gt; xyz.tif) and is saved in the same folder.
@@ -100,9 +101,9 @@
 <a name="Existing_project_files" id="Existing_project_files"></a><h3> <span class="mw-headline"> Existing project files </span></h3>
 <p>With File-&gt;Search directory for...-&gt;Projects you can search recursively in the given folder for (existing) project files and appends them to (stitching) queue.
 </p>
-<a name="New_project_files" id="New_project_files"></a><h3> <span class="mw-headline"> New project files </span></h3>
-<p>First select a folder in which should be searched. After pressing start is searches for image files in the folder (and optionally its sub folders). It uses the information stored in the EXIF data to decide which images could belong to a panorama. This works only in one folder level, it does not match images in different folders. (It uses camera maker, camera model, focal length, image size and date/time for this decision.) 
-</p><p>After the search has finished it shows a list of the found panoramas. With <b>Send selected panoramas to queue</b> the project files are created and send to the assistant queue. You can deselect individual panoramas from this processing step by untick the panorama.
+<a name="Image_sets_.28create_project_files.29" id="Image_sets_.28create_project_files.29"></a><h3> <span class="mw-headline"> Image sets (create project files) </span></h3>
+<p>First select a folder in which PTBatcherGui should search for image sets. After pressing start it will search for image files in the folder (and optionally its sub folders). It uses the information stored in the EXIF data to decide which images could belong to a an image set forming a panorama. This works only in one folder level, it does not match images in different folders. (The algorithm uses camera maker, camera model, focal length, image size and date/time for this decision.) 
+</p><p>After the search has finished it shows a list of the found panoramas. With <b>Send selected panoramas to queue</b> the project files are created and sent to the assistant queue. You can deselect individual panoramas from this processing step by untick the panorama.
 </p><p>The project files are named with the selected name scheme
 </p>
 <ul><li> PanoramaXX.pto: This will generate project files: panorama0.pto, panorama1.pto,...
@@ -110,8 +111,9 @@
 </li><li> Foldername.pto: In this case the project file is named like the containing folder.
 </li></ul>
 <p>Existing project files will not be overwritten, instead it appends an increasing number.
-</p><p>If the images are shoot with auto bracketing it tries to generate the appropriate stacks. In this case check that you default control point generator setting is one which works with stacks (check <a href="Hugin_Preferences.html#Control_Point_Detectors" title="Hugin Preferences">Preferences in Hugin</a> and <a href="Hugin_Parameters_for_Control_Point_Detectors_dialog.html" title="Hugin Parameters for Control Point Detectors dialog">control point detector parameters</a>).
+</p><p>If the images are shot with auto bracketing it tries to generate the appropriate stacks. In this case check that your default control point generator setting is such that it works with stacks (check <a href="Hugin_Preferences.html#Control_Point_Detectors" title="Hugin Preferences">Preferences in Hugin</a> and <a href="Hugin_Parameters_for_Control_Point_Detectors_dialog.html" title="Hugin Parameters for Control Point Detectors dialog">control point detector parameters</a>).
 If you shoot from a tripod then you can select also <b>Create links</b>. This will link the positions of all images of one stack. If you deselect this option, it will create the stacks but will not link the positions of the images (e.g. when shooting free hand).
+</p><p>If you set the tickmark <b>Automatic stitch after assistant</b>, PTBatcherGui will first run the assistant on all found panoramas, thereby creating the complete project files, and then stitch all created projects.
 </p>
 <a name="Command_line_switches" id="Command_line_switches"></a><h1> <span class="mw-headline"> Command line switches </span></h1>
 <a name="PTBatcherGUI" id="PTBatcherGUI"></a><h2> <span class="mw-headline"> PTBatcherGUI </span></h2>
@@ -178,4 +180,4 @@
 
 <div class="printfooter">
 Retrieved from "<a href="Hugin_Batch_Processor.html">http://wiki.panotools.org/Hugin_Batch_Processor</a>"</div>
-			</div></div></div></div></body></html>
\ No newline at end of file
+			</div></div></div></div></body></html>
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html	Sun Dec 11 10:41:15 2011 +0100
@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+		<meta name="generator" content="MediaWiki 1.14.0" />
+		<meta name="keywords" content="Pto gen,Cpfind,Match-n-shift" />
+		
+		
+		
+		
+		
+		
+		<title>Pto gen - PanoTools.org Wiki</title>
+		
+		
+		
+		<!--[if lt IE 5.5000]><![endif]-->
+		<!--[if IE 5.5000]><![endif]-->
+		<!--[if IE 6]><![endif]-->
+		<!--[if IE 7]><![endif]-->
+		
+		
+		
+		
+		<!--[if lt IE 7]>
+		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+
+		
+
+		
+		<style media="screen" type="text/css" title="Screen style sheet"> @import url(manual.css); </style>
+		
+				
+	</head>
+<body class="mediawiki ltr ns-0 ns-subject page-Pto_gen skin-monobook">
+	<div id="globalWrapper">
+		<div id="column-content">
+	<div id="content">
+		<a name="top" id="top"></a>
+				<h1 id="firstHeading" class="firstHeading">Pto gen</h1>
+		<div id="bodyContent">
+			
+			
+												<!-- start content -->
+			<p><b>pto_gen</b> assembles a Hugin .pto project file that is suitable as input for
+further tools such as the <a href="/Cpfind" title="Cpfind">cpfind</a> control-point generator, or for opening
+with the Hugin panorama GUI itself.  Functionality is similar to
+<a href="/wiki/index.php?title=Match-n-shift&amp;action=edit&amp;redlink=1" class="new" title="Match-n-shift (page does not exist)">match-n-shift</a>.
+</p><p>The general use is
+</p>
+<pre>   pto_gen *.jpg
+</pre>
+<p>This creates a project file from all jpg images in the current directory.
+The project file is named First file-last file.pto.
+</p>
+<a name="Options" id="Options"></a><h2> <span class="mw-headline"> Options </span></h2>
+<ul><li> <b>-o | --output output.pto</b> Output a pto file with the given filename (instead of the default).
+</li></ul>
+<ul><li> <b>-p | --projection number</b> Sets the projection type for all images (0 - rectilinear, 2 - equirectangular, 3 - full-frame fisheye, ...).
+</li></ul>
+<ul><li> <b>-f | --fov number</b> Sets the horizontal field of view for all images. Useful if your lens does not store the focal length and/or crop factor correctly in the EXIF data.
+</li></ul>
+<ul><li> <b>-s | --stacklength number</b> Sets the number of images in each stack (default: 1, meaning no stacks).
+</li></ul>
+<ul><li> <b>-l | --linkstacks</b> When given links the image positions in stacks.
+</li></ul>
+<ul><li> <b>-h | --help</b> Display help.
+</li></ul>
+
+
+
+
+<div class="printfooter">
+Retrieved from "http://wiki.panotools.org/Pto_gen<a class="external" href="http://wiki.panotools.org/Pto_gen">[*]</a>"</div>
+						<!-- end content -->
+						
+		</div>
+	</div>
+		</div>
+		<!-- end of the left (by default at least) column -->
+			
+			
+</div>
+
+		
+
+
+
+<!-- Served in 0.183 secs. --></body></html>
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk
--- a/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk	Sun Dec 11 10:41:15 2011 +0100
@@ -384,6 +384,11 @@
 		<param name="Local" value="The_General_Panini_Projection.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Generate pto file">
+		<param name="Name" value="Pto gen - PanoTools.org Wiki">
+		<param name="Local" value="Pto_gen.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="GIF">
 		<param name="Name" value="GIF">
 		<param name="Local" value="GIF.html">
@@ -693,6 +698,11 @@
 		<param name="Local" value="PTmender.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Pto_gen">
+		<param name="Name" value="Pto gen - PanoTools.org Wiki">
+		<param name="Local" value="Pto_gen.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Pto_merge">
 		<param name="Name" value="Pto merge">
 		<param name="Local" value="Pto_merge.html">
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc
--- a/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc	Sun Dec 11 10:41:15 2011 +0100
@@ -136,6 +136,10 @@
 			<param name="Local" value="Checkpto.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Pto_gen">
+			<param name="Local" value="Pto_gen.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Cpfind">
 			<param name="Local" value="Cpfind.html">
 			</OBJECT>
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp
--- a/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp	Sun Dec 11 10:41:15 2011 +0100
@@ -132,6 +132,7 @@
 PTblender.html
 PTmender.html
 Pto2mk.html
+Pto_gen.html
 Pto_merge.html
 PTOptimizer.html
 PTStitcher.html
diff -r ae9da50d547d -r c884730defe3 src/hugin1/hugin/xrc/data/help_en_EN/pages.txt
--- a/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt	Sat Dec 10 19:44:32 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt	Sun Dec 11 10:41:15 2011 +0100
@@ -115,6 +115,7 @@
 Pfstmo
 Pincushion_distortion
 Pitch
+Pto_gen
 Pto_merge
 PNG
 Portrait

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/ae9da50d547d
changeset:  5697:ae9da50d547d
user:       tmodes
date:       Sat Dec 10 19:44:32 2011 +0100
description:

PTBatcherGUI: Copy settings from preferences into new projects

diffstat:

 src/hugin1/ptbatcher/FindPanoDialog.cpp |  50 ++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 deletions(-)

diffs (69 lines):

diff -r 34731742606a -r ae9da50d547d src/hugin1/ptbatcher/FindPanoDialog.cpp
--- a/src/hugin1/ptbatcher/FindPanoDialog.cpp	Sat Dec 10 12:55:36 2011 +0100
+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp	Sat Dec 10 19:44:32 2011 +0100
@@ -29,6 +29,7 @@
 #include "panoinc.h"
 #include "PTBatcherGUI.h"
 #include "hugin_utils/alphanum.h"
+#include "hugin/config_defaults.h"
 
 BEGIN_EVENT_TABLE(FindPanoDialog,wxDialog)
     EVT_BUTTON(XRCID("find_pano_close"), FindPanoDialog::OnButtonClose)
@@ -690,9 +691,56 @@
             };
         };
     };
+    // Setup pano with options from preferences
+    PanoramaOptions opts = pano.getOptions();
     //set default exposure value
-    PanoramaOptions opts = pano.getOptions();
     opts.outputExposureValue = pano.getImage(0).getExposureValue();
+    wxConfigBase* config = wxConfigBase::Get();
+    opts.quality = config->Read(wxT("/output/jpeg_quality"),HUGIN_JPEG_QUALITY);
+    switch(config->Read(wxT("/output/tiff_compression"), HUGIN_TIFF_COMPRESSION))
+    {
+        case 0:
+        default:
+            opts.outputImageTypeCompression = "NONE";
+            opts.tiffCompression = "NONE";
+            break;
+        case 1:
+            opts.outputImageTypeCompression = "PACKBITS";
+            opts.tiffCompression = "PACKBITS";
+            break;
+        case 2:
+            opts.outputImageTypeCompression = "LZW";
+            opts.tiffCompression = "LZW";
+            break;
+        case 3:
+            opts.outputImageTypeCompression = "DEFLATE";
+            opts.tiffCompression = "DEFLATE";
+            break;
+    }
+    switch (config->Read(wxT("/output/ldr_format"), HUGIN_LDR_OUTPUT_FORMAT))
+    {
+        case 1:
+            opts.outputImageType ="jpg";
+            break;
+        case 2:
+            opts.outputImageType ="png";
+            break;
+        case 3:
+            opts.outputImageType ="exr";
+            break;
+        default:
+        case 0:
+            opts.outputImageType ="tif";
+            break;
+    }
+    opts.outputFormat = PanoramaOptions::TIFF_m;
+    opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
+    opts.enblendOptions = config->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
+    opts.enfuseOptions = config->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);
+    opts.interpolator = (vigra_ext::Interpolator)config->Read(wxT("Nona/Interpolator"),HUGIN_NONA_INTERPOLATOR);
+    opts.tiff_saveROI = config->Read(wxT("Nona/CroppedImages"),HUGIN_NONA_CROPPEDIMAGES)!=0;
+    opts.hdrMergeMode = PanoramaOptions::HDRMERGE_AVERAGE;
+    opts.hdrmergeOptions = HUGIN_HDRMERGE_ARGS;
     pano.setOptions(opts);
 
     std::ofstream script(projectFile.GetFullPath().mb_str(HUGIN_CONV_FILENAME));

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/34731742606a
changeset:  5696:34731742606a
user:       harryvanderwolf <hvdwolf@...>
date:       Sat Dec 10 12:55:36 2011 +0100
description:

[OSX] Add pto_gen to XCode project and distribution in dmg

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  221 +++++++++++++++++++++++++++++++++++-
 1 files changed, 220 insertions(+), 1 deletions(-)

diffs (350 lines):

diff -r e2bc6afb14bf -r 34731742606a mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Sat Dec 10 10:12:01 2011 +0100
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Sat Dec 10 12:55:36 2011 +0100
@@ -74,6 +74,7 @@
 				733DF684117F24ED002EC787 /* PBXTargetDependency */,
 				73FC2AF6110057CB00EAB009 /* PBXTargetDependency */,
 				73FC2AF8110057CB00EAB009 /* PBXTargetDependency */,
+				7377D70F148FD6EE004FE48D /* PBXTargetDependency */,
 				733DF686117F2531002EC787 /* PBXTargetDependency */,
 				E8A7DD8A10FCB38800839DF3 /* PBXTargetDependency */,
 				73FC2AFA110057CB00EAB009 /* PBXTargetDependency */,
@@ -1114,6 +1115,32 @@
 		7377C70A10641769002EF919 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		7377C70B10641769002EF919 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		7377C7441064212B002EF919 /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; };
+		7377D6C6148FD612004FE48D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		7377D6C7148FD612004FE48D /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		7377D6C8148FD612004FE48D /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		7377D6C9148FD612004FE48D /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		7377D6CA148FD612004FE48D /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		7377D6CB148FD612004FE48D /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		7377D6CC148FD612004FE48D /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		7377D6CD148FD612004FE48D /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		7377D6CE148FD612004FE48D /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		7377D6CF148FD612004FE48D /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		7377D6D0148FD612004FE48D /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		7377D6D1148FD612004FE48D /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		7377D6D2148FD612004FE48D /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		7377D6D3148FD612004FE48D /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		7377D6D4148FD612004FE48D /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		7377D6D5148FD612004FE48D /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
+		7377D6D6148FD612004FE48D /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		7377D6D7148FD612004FE48D /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		7377D6D8148FD612004FE48D /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		7377D6D9148FD612004FE48D /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		7377D6DA148FD612004FE48D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		7377D6DB148FD612004FE48D /* libexiv2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98310FB69FC00839DF3 /* libexiv2.dylib */; };
+		7377D709148FD689004FE48D /* pto_gen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D708148FD689004FE48D /* pto_gen.cpp */; };
+		7377D716148FDA70004FE48D /* LayerStacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D715148FDA70004FE48D /* LayerStacks.cpp */; };
+		7377D717148FDA70004FE48D /* LayerStacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7377D715148FDA70004FE48D /* LayerStacks.cpp */; };
+		7377D74D148FE48A004FE48D /* pto_gen in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7377D6E0148FD612004FE48D /* pto_gen */; };
 		737C8C27139A6ECB00F82635 /* LensTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737C8C25139A6ECB00F82635 /* LensTools.cpp */; };
 		737C8C28139A6ECB00F82635 /* LensTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 737C8C26139A6ECB00F82635 /* LensTools.h */; };
 		737C8CA5139A726C00F82635 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */; };
@@ -2891,6 +2918,27 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		7377D6C0148FD612004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		7377D6C2148FD612004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		7377D70E148FD6EE004FE48D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7377D6BE148FD612004FE48D /* pto_gen */;
+			remoteInfo = pto_gen;
+		};
 		737E48B011D3F8C6002BA8AE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -3575,6 +3623,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				7377D74D148FE48A004FE48D /* pto_gen in Copy Executable Files */,
 				73120196141FCA71005071A9 /* linefind in Copy Executable Files */,
 				738A8754126AE53A00DC20B6 /* autooptimiser in Copy Executable Files */,
 				738A8756126AE53A00DC20B6 /* celeste_standalone in Copy Executable Files */,
@@ -4363,6 +4412,9 @@
 		7368E4631083ABF200519ED0 /* NumTransDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumTransDialog.cpp; sourceTree = "<group>"; };
 		736945F5126A235E00BD9B27 /* Hugin-Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Hugin-Info copy 2.plist"; path = "../mac/Hugin-Info copy 2.plist"; sourceTree = "<group>"; };
 		736FD2C80DA158A2009A47C2 /* tca_correct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tca_correct.cpp; sourceTree = "<group>"; };
+		7377D6E0148FD612004FE48D /* pto_gen */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_gen; sourceTree = BUILT_PRODUCTS_DIR; };
+		7377D708148FD689004FE48D /* pto_gen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto_gen.cpp; sourceTree = "<group>"; };
+		7377D715148FDA70004FE48D /* LayerStacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerStacks.cpp; path = algorithms/basic/LayerStacks.cpp; sourceTree = "<group>"; };
 		737C2238126DB73A0096DB59 /* Hugin-Info copy 3.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Hugin-Info copy 3.plist"; path = "../mac/Hugin-Info copy 3.plist"; sourceTree = "<group>"; };
 		737C228A126DB7580096DB59 /* PTBatcherGUI-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PTBatcherGUI-Info copy.plist"; sourceTree = "<group>"; };
 		737C8C25139A6ECB00F82635 /* LensTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LensTools.cpp; sourceTree = "<group>"; };
@@ -5298,6 +5350,35 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		7377D6C5148FD612004FE48D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7377D6C6148FD612004FE48D /* libz.dylib in Frameworks */,
+				7377D6C7148FD612004FE48D /* libpng.dylib in Frameworks */,
+				7377D6C8148FD612004FE48D /* libtiff.dylib in Frameworks */,
+				7377D6C9148FD612004FE48D /* libjpeg.dylib in Frameworks */,
+				7377D6CA148FD612004FE48D /* libIex.dylib in Frameworks */,
+				7377D6CB148FD612004FE48D /* libIlmThread.dylib in Frameworks */,
+				7377D6CC148FD612004FE48D /* libIlmImf.dylib in Frameworks */,
+				7377D6CD148FD612004FE48D /* libImath.dylib in Frameworks */,
+				7377D6CE148FD612004FE48D /* libHalf.dylib in Frameworks */,
+				7377D6CF148FD612004FE48D /* libpano13.dylib in Frameworks */,
+				7377D6D0148FD612004FE48D /* libboost_thread.dylib in Frameworks */,
+				7377D6D1148FD612004FE48D /* libboost_date_time.dylib in Frameworks */,
+				7377D6D2148FD612004FE48D /* libboost_filesystem.dylib in Frameworks */,
+				7377D6D3148FD612004FE48D /* libboost_iostreams.dylib in Frameworks */,
+				7377D6D4148FD612004FE48D /* libboost_regex.dylib in Frameworks */,
+				7377D6D5148FD612004FE48D /* libboost_signals.dylib in Frameworks */,
+				7377D6D6148FD612004FE48D /* libboost_system.dylib in Frameworks */,
+				7377D6D7148FD612004FE48D /* libexpat.dylib in Frameworks */,
+				7377D6D8148FD612004FE48D /* HuginVigraImpex.framework in Frameworks */,
+				7377D6D9148FD612004FE48D /* HuginBase.framework in Frameworks */,
+				7377D6DA148FD612004FE48D /* libiconv.dylib in Frameworks */,
+				7377D6DB148FD612004FE48D /* libexiv2.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		737E48B511D3F8C6002BA8AE /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -6164,6 +6245,7 @@
 				5796FA950C4395CC006B7C6E /* nona */,
 				733DF63F117F2268002EC787 /* pano_modify */,
 				733DF66E117F2384002EC787 /* pto_merge */,
+				7377D6E0148FD612004FE48D /* pto_gen */,
 				E8A7D9BA10FB6F5A00839DF3 /* pto2mk */,
 				E8A7D9B710FB6F5A00839DF3 /* pano_trafo */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
@@ -6264,6 +6346,7 @@
 		57460AB30C4E7BD5004507F7 /* tools */ = {
 			isa = PBXGroup;
 			children = (
+				7377D708148FD689004FE48D /* pto_gen.cpp */,
 				73E7D412141FBEA700A6C583 /* linefind.cpp */,
 				7396E473126980F80096D1B3 /* checkpto.cpp */,
 				73BBCD38117E2D3600E37B36 /* pto_merge.cpp */,
@@ -6966,6 +7049,7 @@
 		57EA83990C3A7A9500E4965E /* basic */ = {
 			isa = PBXGroup;
 			children = (
+				7377D715148FDA70004FE48D /* LayerStacks.cpp */,
 				73F54BA0129809A000141773 /* TranslatePanorama.h */,
 				73F54BA1129809A000141773 /* TranslatePanorama.cpp */,
 				7318CA64119D371100DBD6FD /* CalculateOverlap.h */,
@@ -8924,6 +9008,24 @@
 			productReference = 7364217010763A22000121C5 /* deghosting_mask */;
 			productType = "com.apple.product-type.tool";
 		};
+		7377D6BE148FD612004FE48D /* pto_gen */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7377D6DC148FD612004FE48D /* Build configuration list for PBXNativeTarget "pto_gen" */;
+			buildPhases = (
+				7377D6C3148FD612004FE48D /* Sources */,
+				7377D6C5148FD612004FE48D /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				7377D6BF148FD612004FE48D /* PBXTargetDependency */,
+				7377D6C1148FD612004FE48D /* PBXTargetDependency */,
+			);
+			name = pto_gen;
+			productName = "sample open_close";
+			productReference = 7377D6E0148FD612004FE48D /* pto_gen */;
+			productType = "com.apple.product-type.tool";
+		};
 		737E48AE11D3F8C6002BA8AE /* StitchProject */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 737E48D611D3F8C6002BA8AE /* Build configuration list for PBXNativeTarget "StitchProject" */;
@@ -9431,6 +9533,7 @@
 				733DF623117F2268002EC787 /* pano_modify */,
 				739A0DBC10FA5FB700D8E4C7 /* pto2mk */,
 				733DF653117F2384002EC787 /* pto_merge */,
+				7377D6BE148FD612004FE48D /* pto_gen */,
 				739A0CED10FA56D300D8E4C7 /* tca_correct */,
 				7364216F10763A22000121C5 /* deghosting_mask */,
 				7332AE910D8D4986002BF5FF /* matchpoint */,
@@ -10039,7 +10142,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint nona pano_modify pano_trafo pto2mk pto_merge PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
+			shellScript = "#!/bin/sh\n\n#  $Id: create_hugin_tools_folder with symlinks $\n\nbinaries=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind deghosting_mask exiv2 fulla hugin_hdrmerge icpfind linefind matchpoint nona pano_modify pano_trafo pto2mk pto_gen pto_merge PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop tca_correct vig_optimize enfuse enblend gnumake\"\ntarg_folder=\"$TARGET_BUILD_DIR/InstallerFolder/HuginTools\"\n\n#------------------------------------------------\n\nrm -rf \"$targ_folder\"\nmkdir -p \"$targ_folder\"\ncd \"$targ_folder\"\nfor bins in $binaries\ndo\n ln -s \"../Hugin.app/Contents/MacOS/$bins\" \"$bins\"\ndone\n";
 		};
 		73B1AD1313A6A5D1006A3C54 /* let swig create wrapper swigpyrun.h */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10308,6 +10411,7 @@
 				73DFBC98139B516C00558A2D /* FindN8Lines.cpp in Sources */,
 				73DFBC9A139B516C00558A2D /* FindLines.cpp in Sources */,
 				73FDC9BF13A7D4DC0042030D /* alphanum.cpp in Sources */,
+				7377D716148FDA70004FE48D /* LayerStacks.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10641,6 +10745,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		7377D6C3148FD612004FE48D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7377D709148FD689004FE48D /* pto_gen.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		737E48B311D3F8C6002BA8AE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -10790,6 +10902,7 @@
 				739285FD14225F240051CAEC /* FindN8Lines.cpp in Sources */,
 				739285FE14225F240051CAEC /* FindLines.cpp in Sources */,
 				739285FF14225F240051CAEC /* alphanum.cpp in Sources */,
+				7377D717148FDA70004FE48D /* LayerStacks.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11489,6 +11602,21 @@
 			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
 			targetProxy = 7377C70810641712002EF919 /* PBXContainerItemProxy */;
 		};
+		7377D6BF148FD612004FE48D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;
+			targetProxy = 7377D6C0148FD612004FE48D /* PBXContainerItemProxy */;
+		};
+		7377D6C1148FD612004FE48D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 576900A90D24D29300A6AD01 /* hugin_base Framework */;
+			targetProxy = 7377D6C2148FD612004FE48D /* PBXContainerItemProxy */;
+		};
+		7377D70F148FD6EE004FE48D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7377D6BE148FD612004FE48D /* pto_gen */;
+			targetProxy = 7377D70E148FD6EE004FE48D /* PBXContainerItemProxy */;
+		};
 		737E48AF11D3F8C6002BA8AE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769FC280D24A26400A6AD01 /* frameworks */;
@@ -14942,6 +15070,87 @@
 			};
 			name = Release;
 		};
+		7377D6DD148FD612004FE48D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Debug;
+		};
+		7377D6DE148FD612004FE48D /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				PRODUCT_NAME = hugin_hdrmerge;
+			};
+			name = Development;
+		};
+		7377D6DF148FD612004FE48D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEPLOYMENT_POSTPROCESSING = YES;
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/foreign/vigra,
+					../src/hugin_base,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib-static\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../../Shared/development/hugin/mac/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../ExternalPrograms/3way-repository/lib\"";
+				PRODUCT_NAME = pto_gen;
+			};
+			name = Release;
+		};
 		737C8C13139A689700F82635 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -17551,6 +17760,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		7377D6DC148FD612004FE48D /* Build configuration list for PBXNativeTarget "pto_gen" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7377D6DD148FD612004FE48D /* Debug */,
+				7377D6DE148FD612004FE48D /* Development */,
+				7377D6DF148FD612004FE48D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		737C8C16139A68B600F82635 /* Build configuration list for PBXAggregateTarget "Create Hugin-PTBatcherGui-calibrate_lens_gui for Installer" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (