Hugin

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3e7dae57442a
changeset: 4522:3e7dae57442a
user:      tmodes
date:       Tue Oct 26 20:39:06 2010 +0200
description:
Fixes crash when pressing 0 in cp tab [3094923]

diffstat:

 src/hugin1/hugin/CPEditorPanel.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 17d7a29f6f95 -r 3e7dae57442a src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Sun Oct 24 11:02:26 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Tue Oct 26 20:39:06 2010 +0200
@@ -1849,7 +1849,7 @@
         wxCommandEvent dummy;
         dummy.SetInt(1);
         OnZoom(dummy);
-        XRCCTRL(*this,"cp_editor_choiec_zoom",wxChoice)->SetSelection(1);
+        XRCCTRL(*this,"cp_editor_choice_zoom",wxChoice)->SetSelection(1);
     } else if (e.m_keyCode == '1') {
         wxCommandEvent dummy;
         dummy.SetInt(0);

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/54d7e6b5d3ac
changeset: 4520:54d7e6b5d3ac
user:      tmodes
date:       Sun Oct 24 10:56:47 2010 +0200
description:
Fixes typo

diffstat:

 src/hugin_cpfind/cpfind/PanoDetector.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r d887c2ac4c0a -r 54d7e6b5d3ac src/hugin_cpfind/cpfind/PanoDetector.cpp
--- a/src/hugin_cpfind/cpfind/PanoDetector.cpp	Sun Oct 24 10:56:39 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetector.cpp	Sun Oct 24 10:56:47 2010 +0200
@@ -180,7 +180,7 @@
 
 void PanoDetector::printFilenames()
 {
-    cout << endl << "Project contains the follow images:" << endl;
+    cout << endl << "Project contains the following images:" << endl;
     for(unsigned int i=0;i<_panoramaInfo->getNrOfImages();i++)
     {
         std::string name(_panoramaInfo->getImage(i).getFilename());

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/17d7a29f6f95
changeset: 4521:17d7a29f6f95
user:      tmodes
date:       Sun Oct 24 11:02:26 2010 +0200
description:
Improved loading of images in cpfind
This should fix loading of 16 bit images [3089090]

diffstat:

 src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp |  333 +++++++++++++------------
 1 files changed, 179 insertions(+), 154 deletions(-)

diffs (393 lines):

diff -r 54d7e6b5d3ac -r 17d7a29f6f95 src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
--- a/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp	Sun Oct 24 10:56:47 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp	Sun Oct 24 11:02:26 2010 +0200
@@ -121,195 +121,228 @@
     return true;
 }
 
+// save some intermediate images to disc if defined
+// #define DEBUG_LOADING_REMAPPING
 bool PanoDetector::AnalyzeImage(ImgData& ioImgInfo, const PanoDetector& iPanoDetector)
 {
-	vigra::DImage final_img(ioImgInfo._detectWidth, ioImgInfo._detectHeight);
+    vigra::DImage final_img;
     vigra::BImage final_mask;
 
     try
     {
         ioImgInfo._loadFail=false;
-    	// Remap image to stereographic if needed
-	    if(ioImgInfo._needsremap)
-    	{
-            TRACE_IMG("Remapping image...");
-    		// Load and format images
-            MultiProgressDisplay* progress=new DummyMultiProgressDisplay();
-	    	FileRemapper<vigra::BRGBImage, vigra::BImage> remapper;	//TODO : Grayscale images case
-		    progress->pushTask(ProgressTask("", "", 1.0));
-	    	RemappedPanoImage<vigra::BRGBImage, vigra::BImage> * remapped = 
-		    	remapper.getRemapped(iPanoDetector._panoramaInfoCopy, ioImgInfo._projOpts, ioImgInfo._number, 
-			    							vigra::Rect2D(0,0,ioImgInfo._detectWidth, ioImgInfo._detectHeight), *progress);
-    		vigra::BRGBImage RGBimg = remapped->m_image;
-	    	final_mask = remapped->m_mask;
-		    progress->popTask();
-       	    remapper.release(remapped);
 
-            if(iPanoDetector.getCeleste())
-            {
-                TRACE_IMG("Masking areas with clouds...");
-                vigra::UInt16RGBImage image16(RGBimg.size());
-                vigra::transformImage(srcImageRange(RGBimg),destImage(image16),vigra::functor::Arg1()*vigra::functor::Param(65535/255));
-                int radius=iPanoDetector.getCelesteRadius();
-                if(iPanoDetector._downscale)
-                {
-                    radius>>= 1;
-                };
-                if(radius<2)
-                {
-                    radius=2;
-                };
-                vigra::BImage celeste_mask=celeste::getCelesteMask(iPanoDetector.svmModel,image16,radius,iPanoDetector.getCelesteThreshold(),800,true,false);
-                vigra::copyImageIf(srcImageRange(final_mask),srcImage(celeste_mask),destImage(final_mask));
-                celeste_mask.resize(0,0);
-                image16.resize(0,0);
-            };
-            
-    		// Convert to grayscale double format
-            TRACE_IMG("Convert to greyscale double...");
-	    	vigra::copyImage(
-		    	RGBimg.upperLeft(),
-			    RGBimg.lowerRight(),
-    			vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
-	    		final_img.upperLeft(),
-		    	vigra::DImage::Accessor());
-        
-            delete progress;
-	    }
+        TRACE_IMG("Load image...");
+        vigra::ImageImportInfo aImageInfo(ioImgInfo._name.c_str());
+        vigra::FRGBImage RGBimg(aImageInfo.width(), aImageInfo.height());
+        vigra::BImage mask;
+        if(aImageInfo.numExtraBands() == 1) 
+        {
+            mask.resize(aImageInfo.size());
+            importImageAlpha(aImageInfo, destImage(RGBimg), destImage(mask));
+        } 
         else
         {
-            // Simply load images
-	        vigra::ImageImportInfo aImageInfo(ioImgInfo._name.c_str());
-            vigra::BRGBImage RGBimg(aImageInfo.width(), aImageInfo.height());
-            vigra::BImage mask;
-
-            TRACE_IMG("Loading image...");
-            if(aImageInfo.numExtraBands() == 1) 
+            if (aImageInfo.numExtraBands() == 0) 
             {
-                mask.resize(aImageInfo.size());
-                importImageAlpha(aImageInfo, destImage(RGBimg), destImage(mask));
-            } 
+                vigra::importImage(aImageInfo, destImage(RGBimg));
+            }
             else
             {
-                if (aImageInfo.numExtraBands() == 0) 
-                {
-                    vigra::importImage(aImageInfo, destImage(RGBimg));
-                    if(iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).hasActiveMasks())
-                    {
-                        mask.resize(aImageInfo.size().width(),aImageInfo.size().height(),255);
-                    };
-                }
-                else
-                {
-                    TRACE_INFO("Image with multiple alpha channels are not supported");
-                    ioImgInfo._loadFail = true;
-                    return false;
-                };
+                TRACE_INFO("Image with multiple alpha channels are not supported");
+                ioImgInfo._loadFail = true;
+                return false;
             };
+        };
+        //convert image, so that all (rgb) values are between 0 and 1
+        if(aImageInfo.getPixelType() == "FLOAT" || aImageInfo.getPixelType() == "DOUBLE")
+        {
+            vigra::RGBToGrayAccessor<vigra::RGBValue<float> > ga;
+            vigra::FindMinMax<float> minmax;   // init functor
+            vigra::inspectImage(srcImageRange(RGBimg, ga),minmax);
+            double minVal = minmax.min;
+            double maxVal = minmax.max;
+            vigra_ext::applyMapping(srcImageRange(RGBimg), destImage(RGBimg), minVal, maxVal, 0);
+        }
+        else
+        {
+            vigra::transformImage(srcImageRange(RGBimg), destImage(RGBimg),
+                vigra::functor::Arg1()/vigra::functor::Param(vigra_ext::getMaxValForPixelType(aImageInfo.getPixelType())));
+        };
 
+        if(ioImgInfo._needsremap)
+        {
+            TRACE_IMG("Remap image...");
+            RemappedPanoImage<vigra::FRGBImage,vigra::BImage>* remapped=new RemappedPanoImage<vigra::FRGBImage,vigra::BImage>;
+            vigra::FImage ffImg;
+            MultiProgressDisplay* progress=new DummyMultiProgressDisplay();
+            remapped->setPanoImage(iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number),
+                    ioImgInfo._projOpts,vigra::Rect2D(0,0,ioImgInfo._detectWidth, ioImgInfo._detectHeight));
+            if(mask.width()>0)
+            {
+                remapped->remapImage(vigra::srcImageRange(RGBimg),vigra::srcImage(mask),vigra_ext::INTERP_CUBIC,*progress);
+            }
+            else
+            {
+                remapped->remapImage(vigra::srcImageRange(RGBimg),vigra_ext::INTERP_CUBIC,*progress);
+            };
+            RGBimg.resize(0,0);
+            mask.resize(0,0);
+            RGBimg=remapped->m_image;
+            mask=remapped->m_mask;
+            delete remapped;
+            delete progress;
+        }
+        else
+        {
             if(iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).hasActiveMasks())
             {
+                if(mask.width()!=aImageInfo.width() || mask.height()!=aImageInfo.height())
+                {
+                    mask.resize(aImageInfo.size().width(),aImageInfo.size().height(),255);
+                };
                 //copy mask from pto file into alpha layer
                 vigra_ext::applyMask(vigra::destImageRange(mask), iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).getActiveMasks());
             };
+        };
 
-            if(iPanoDetector.getCeleste())
+        if(iPanoDetector.getCeleste())
+        {
+            vigra::FRGBImage scaled(ioImgInfo._detectWidth,ioImgInfo._detectHeight);
+            if(iPanoDetector._downscale && (!ioImgInfo._needsremap))
             {
-                TRACE_IMG("Resizing image...");
-                vigra::BRGBImage scaled(final_img.size());
-                if(iPanoDetector._downscale)
+                TRACE_IMG("Resize image...");
+                vigra::resizeImageNoInterpolation(srcImageRange(RGBimg),destImageRange(scaled));
+                if(mask.width()>0 && mask.height()>0)
                 {
-                    vigra::resizeImageNoInterpolation(srcImageRange(RGBimg),destImageRange(scaled));
-                    if(mask.width()>0 && mask.height()>0)
-                    {
-                        final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
-                        vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask));
-                        mask.resize(0,0);
-                    };
-                }
-                else
-                {
-                    vigra::copyImage(srcImageRange(RGBimg),destImage(scaled));
+                    final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
+                    vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask));
                 };
-                TRACE_IMG("Masking areas with clouds...");
-                vigra::UInt16RGBImage image16(scaled.size());
-                vigra::transformImage(srcImageRange(scaled),destImage(image16),vigra::functor::Arg1()*vigra::functor::Param(65535/255));
-                int radius=iPanoDetector.getCelesteRadius();
-                if(iPanoDetector._downscale)
-                {
-                    radius>>= 1;
-                };
-                if(radius<2)
-                {
-                    radius=2;
-                };
-                vigra::BImage celeste_mask=celeste::getCelesteMask(iPanoDetector.svmModel,image16,radius,iPanoDetector.getCelesteThreshold(),800,true,false);
-                image16.resize(0,0);
-                if(final_mask.width()>0)
-                {
-                    vigra::copyImageIf(srcImageRange(final_mask),srcImage(celeste_mask),destImage(final_mask));
-                }
-                else
-                {
-                    final_mask.resize(final_img.size());
-                    vigra::copyImage(srcImageRange(celeste_mask),destImage(final_mask));
-                };
-                celeste_mask.resize(0,0);
-                TRACE_IMG("Convert to greyscale double...");
-                vigra::copyImage(scaled.upperLeft(), scaled.lowerRight(), vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
-                    final_img.upperLeft(), vigra::DImage::Accessor());
-                scaled.resize(0,0);
             }
             else
             {
-                if (iPanoDetector._downscale)
+                vigra::copyImage(srcImageRange(RGBimg),destImage(scaled));
+                if(mask.width()>0 && mask.height()>0)
                 {
-                    // Downscale and convert to grayscale double format
-                    TRACE_IMG("Resize to greyscale double...");
-                    vigra::resizeImageNoInterpolation(
-                        RGBimg.upperLeft(),
-                        RGBimg.upperLeft() + vigra::Diff2D(aImageInfo.width(), aImageInfo.height()),
-                        vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
-                        final_img.upperLeft(),
-                        final_img.lowerRight(),
-                        vigra::DImage::Accessor());
-                    //downscale mask
-                    if(mask.width()>0 && mask.height()>0)
-                    {
-                        final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
-                        vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask));
-                        mask.resize(0,0);
-                    };
-                }
-                else
-                {
-                    // convert to grayscale
-                    TRACE_IMG("Convert to greyscale double...");
-                    vigra::copyImage(RGBimg.upperLeft(), RGBimg.lowerRight(), vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
-                        final_img.upperLeft(), vigra::DImage::Accessor());
-                    if(mask.width()>0 && mask.height()>0)
-                    {
-                        final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
-                        vigra::copyImage(srcImageRange(mask),destImage(final_mask));
-                        mask.resize(0,0);
-                    };
+                    final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
+                    vigra::copyImage(srcImageRange(mask),destImage(final_mask));
                 };
             };
+            RGBimg.resize(0,0);
+            mask.resize(0,0);
+            TRACE_IMG("Mask areas with clouds...");
+            vigra::UInt16RGBImage image16(scaled.size());
+            vigra::transformImage(srcImageRange(scaled),destImage(image16),vigra::functor::Arg1()*vigra::functor::Param(65535));
+            int radius=iPanoDetector.getCelesteRadius();
+            if(iPanoDetector._downscale)
+            {
+                radius>>= 1;
+            };
+            if(radius<2)
+            {
+                radius=2;
+            };
+            vigra::BImage celeste_mask=celeste::getCelesteMask(iPanoDetector.svmModel,image16,radius,iPanoDetector.getCelesteThreshold(),800,true,false);
+#ifdef DEBUG_LOADING_REMAPPING
+            // DEBUG: export celeste mask
+            std::ostringstream maskfilename;
+            maskfilename << ioImgInfo._name << "_celeste_mask.JPG";
+            vigra::ImageExportInfo maskexinfo(maskfilename.str().c_str());
+            vigra::exportImage(srcImageRange(celeste_mask), maskexinfo);
+#endif
+            image16.resize(0,0);
+            if(final_mask.width()>0)
+            {
+                vigra::copyImageIf(srcImageRange(celeste_mask),srcImage(final_mask),destImage(final_mask));
+            }
+            else
+            {
+                final_mask.resize(ioImgInfo._detectWidth,ioImgInfo._detectHeight);
+                vigra::copyImage(srcImageRange(celeste_mask),destImage(final_mask));
+            };
+            celeste_mask.resize(0,0);
+            TRACE_IMG("Convert to greyscale double...");
+            final_img.resize(ioImgInfo._detectWidth,ioImgInfo._detectHeight);
+            vigra::copyImage(scaled.upperLeft(), scaled.lowerRight(), vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
+                final_img.upperLeft(), vigra::DImage::Accessor());
+            scaled.resize(0,0);
         }
+        else
+        {
+            //without celeste
+            final_img.resize(ioImgInfo._detectWidth,ioImgInfo._detectHeight);
+            if (iPanoDetector._downscale && !ioImgInfo._needsremap)
+            {
+                // Downscale and convert to grayscale double format
+                TRACE_IMG("Resize to greyscale double...");
+                vigra::resizeImageNoInterpolation(
+                    RGBimg.upperLeft(),
+                    RGBimg.upperLeft() + vigra::Diff2D(aImageInfo.width(), aImageInfo.height()),
+                    vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
+                    final_img.upperLeft(),
+                    final_img.lowerRight(),
+                    vigra::DImage::Accessor());
+                RGBimg.resize(0,0);
+                //downscale mask
+                if(mask.width()>0 && mask.height()>0)
+                {
+                    final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
+                    vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask));
+                    mask.resize(0,0);
+                };
+            }
+            else
+            {
+                // convert to grayscale
+                TRACE_IMG("Convert to greyscale double...");
+                vigra::copyImage(RGBimg.upperLeft(), RGBimg.lowerRight(), vigra::RGBToGrayAccessor<vigra::RGBValue<double> >(),
+                    final_img.upperLeft(), vigra::DImage::Accessor());
+                RGBimg.resize(0,0);
+                if(mask.width()>0 && mask.height()>0)
+                {
+                    final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight);          
+                    vigra::copyImage(srcImageRange(mask),destImage(final_mask));
+                    mask.resize(0,0);
+                };
+            };
+        };
+
+        //now scale image from 0..1 to 0..255
+        vigra::transformImage(srcImageRange(final_img),destImage(final_img),vigra::functor::Arg1()*vigra::functor::Param(255));
+
+#ifdef DEBUG_LOADING_REMAPPING
+        // DEBUG: export remapped
+        std::ostringstream filename;
+        filename << ioImgInfo._name << "_grey.JPG";
+        vigra::ImageExportInfo exinfo(filename.str().c_str());
+        vigra::exportImage(srcImageRange(final_img), exinfo);
+#endif
 
         // Build integral image
         TRACE_IMG("Build integral image...");
-        ioImgInfo._ii.init(final_img.begin(), ioImgInfo._detectWidth,ioImgInfo._detectHeight);
+        ioImgInfo._ii.init(final_img.begin(), final_img.width(),final_img.height());
+        final_img.resize(0,0);  
 
         // compute distance map
         if(final_mask.width()>0 && final_mask.height()>0)
         {
-            TRACE_IMG("Building distance map...");
+            TRACE_IMG("Build distance map...");
             //apply threshold, in case loaded mask contains other values than 0 and 255
             vigra::transformImage(srcImageRange(final_mask), destImage(final_mask),
                 vigra::Threshold<vigra::BImage::PixelType, vigra::BImage::PixelType>(1, 255, 0, 255));
             ioImgInfo._distancemap.resize(final_mask.width(),final_mask.height(),0);
             vigra::distanceTransform(srcImageRange(final_mask), destImage(ioImgInfo._distancemap), 255, 2);
+#ifdef DEBUG_LOADING_REMAPPING
+            std::ostringstream maskfilename;
+            maskfilename << ioImgInfo._name << "_mask.JPG";
+            vigra::ImageExportInfo maskexinfo(maskfilename.str().c_str());
+            vigra::exportImage(srcImageRange(final_mask), maskexinfo);
+            std::ostringstream distfilename;
+            distfilename << ioImgInfo._name << "_distancemap.JPG";
+            vigra::ImageExportInfo distexinfo(distfilename.str().c_str());
+            vigra::exportImage(srcImageRange(ioImgInfo._distancemap), distexinfo);
+#endif
+            final_mask.resize(0,0);
         };
     }
     catch (std::exception & e)
@@ -319,14 +352,6 @@
         return false;
     }
 
-#if 0
-	// DEBUG: export remapped image
-    std::ostringstream filename;
-    filename << ioImgInfo._name << "STEREO.JPG"; // opts.getOutputExtension()
-    vigra::ImageExportInfo exinfo(filename.str().c_str());
-    vigra::exportImage(srcImageRange(final_img), exinfo);
-#endif
-
     return true;
 }

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d887c2ac4c0a
changeset: 4519:d887c2ac4c0a
user:      tmodes
date:       Sun Oct 24 10:56:39 2010 +0200
description:
Fixes wrong import/export declaration in celeste

diffstat:

 src/celeste/Celeste.h |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 4e81ef10194b -r d887c2ac4c0a src/celeste/Celeste.h
--- a/src/celeste/Celeste.h	Sat Oct 23 19:39:17 2010 +0100
+++ b/src/celeste/Celeste.h	Sun Oct 24 10:56:39 2010 +0200
@@ -69,7 +69,7 @@
  *  @param dest converted image
  */
 template <class SrcIMG>
-CELESTEIMPEX void convertToUInt16(SrcIMG & src, const std::string & origType, vigra::UInt16RGBImage & dest)
+void convertToUInt16(SrcIMG & src, const std::string & origType, vigra::UInt16RGBImage & dest)
 {
     dest.resize(src.size());
     long newMax=vigra_ext::getMaxValForPixelType("UINT16");

details:   http://hugin.hg.sourceforge.net/hgweb/hugin/autopano-sift-C/hgrepo/h/hu/hugin/autopano-sift-C/rev/1442bb7179d3
changeset: 124:1442bb7179d3
user:      Bruno Postle <bruno@...>
date:       Sat Oct 23 22:43:16 2010 +0100
description:
Fix for build with msvc2008 (davidefabbri)

diffstat:

 DisplayImage.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 3a05721e0be7 -r 1442bb7179d3 DisplayImage.c
--- a/DisplayImage.c	Thu Oct 14 23:00:46 2010 +0200
+++ b/DisplayImage.c	Sat Oct 23 22:43:16 2010 +0100
@@ -335,7 +335,7 @@
        } else if (self->bitsPerPixel == 128) { // (RGBA) * sizeof( float ) * 8 = 4 & 4 * 8 = 128
         float temp; 
         float maxval = 0; 
-        float minval = 3.40282347e+38F; // Assumes 32 bit float, why not?
+        float minval = 3.402823466e+38F; // Assumes 32 bit float, why not?
         float row, mean;
         unsigned int x, y;
         {   int bpp = (self)->bitsPerPixel/8;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/4e81ef10194b
changeset: 4518:4e81ef10194b
user:      James Legg <jlegg@...>
date:       Sat Oct 23 19:39:17 2010 +0100
description:
Safer loading of EXIF metadata (thanks to Andreas Metzler).

diffstat:

 src/hugin_base/panodata/SrcPanoImage.cpp |  6 +++---
 src/lens_calibrate/ProcessImage.cpp      |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 1252d698dcc3 -r 4e81ef10194b src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Sat Oct 23 11:48:00 2010 +0200
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Sat Oct 23 19:39:17 2010 +0100
@@ -749,7 +749,7 @@
 {
     Exiv2::ExifKey key(keyName);
     Exiv2::ExifData::iterator itr = exifData.findKey(key);
-    if (itr != exifData.end()) {
+    if (itr != exifData.end() && itr->count()) {
         value = itr->toLong();
         DEBUG_DEBUG("" << keyName << ": " << value);
         return true;
@@ -763,7 +763,7 @@
 {
     Exiv2::ExifKey key(keyName);
     Exiv2::ExifData::iterator itr = exifData.findKey(key);
-    if (itr != exifData.end()) {
+    if (itr != exifData.end() && itr->count()) {
         value = itr->toFloat();
         DEBUG_DEBUG("" << keyName << ": " << value);
         return true;
@@ -777,7 +777,7 @@
 {
     Exiv2::ExifKey key(keyName);
     Exiv2::ExifData::iterator itr = exifData.findKey(key);
-    if (itr != exifData.end()) {
+    if (itr != exifData.end() && itr->count()) {
         value = itr->toString();
         DEBUG_DEBUG("" << keyName << ": " << value);
         return true;
diff -r 1252d698dcc3 -r 4e81ef10194b src/lens_calibrate/ProcessImage.cpp
--- a/src/lens_calibrate/ProcessImage.cpp	Sat Oct 23 11:48:00 2010 +0200
+++ b/src/lens_calibrate/ProcessImage.cpp	Sat Oct 23 19:39:17 2010 +0100
@@ -804,7 +804,7 @@
 bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, long & value){
 	Exiv2::ExifKey key(keyName);
 	Exiv2::ExifData::iterator itr = exifData.findKey(key);
-	if (itr != exifData.end()) {
+	if (itr != exifData.end() && itr->count()) {
 		value = itr->toLong();
 		//DEBUG_DEBUG("" << keyName << ": " << value);
 		return true;
@@ -816,7 +816,7 @@
 bool getExiv2Value(Exiv2::ExifData& exifData, std::string keyName, float & value){
 	Exiv2::ExifKey key(keyName);
 	Exiv2::ExifData::iterator itr = exifData.findKey(key);
-	if (itr != exifData.end()) {
+	if (itr != exifData.end() && itr->count()) {
 		value = itr->toFloat();
 		//DEBUG_DEBUG("" << keyName << ": " << value);
 	return true;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/1252d698dcc3
changeset: 4517:1252d698dcc3
user:      tmodes
date:       Sat Oct 23 11:48:00 2010 +0200
description:
Better remapping for portrait images in cpfind

diffstat:

 src/hugin_cpfind/cpfind/PanoDetector.cpp |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r e185a4f4a58e -r 1252d698dcc3 src/hugin_cpfind/cpfind/PanoDetector.cpp
--- a/src/hugin_cpfind/cpfind/PanoDetector.cpp	Sat Oct 23 11:19:02 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetector.cpp	Sat Oct 23 11:48:00 2010 +0200
@@ -544,6 +544,12 @@
 	// Add images found in the project file to _filesData
 	unsigned int nImg = _panoramaInfo->getNrOfImages();
     unsigned int imgWithKeyfile=0;
+    PanoramaOptions fovOpts;
+    fovOpts.setProjection(PanoramaOptions::EQUIRECTANGULAR);
+    fovOpts.setHFOV(360);
+    fovOpts.setVFOV(180);
+    fovOpts.setWidth(360);
+    fovOpts.setHeight(180);
 	for (unsigned int imgNr = 0; imgNr < nImg; ++imgNr)
 	{
 		// insert the image in the map
@@ -594,7 +600,17 @@
         if(aImgData._needsremap)
         {
             aImgData._projOpts = _panoramaInfoCopy.getOptions();
-            aImgData._projOpts.setHFOV(img.getHFOV());
+            //determine size of image in angles, needed for portrait images
+            vigra::Rect2D roi=estimateOutputROI(_panoramaInfoCopy,fovOpts,imgNr);
+            if(img.getWidth()>img.getHeight())
+            {
+                
+                aImgData._projOpts.setHFOV(2*(std::max(180-roi.left(),roi.right()-180)));
+            }
+            else
+            {
+                aImgData._projOpts.setHFOV(2*(std::max(90-roi.top(),roi.bottom()-90)));
+            };
             aImgData._projOpts.setWidth(_filesData[imgNr]._detectWidth);
             aImgData._projOpts.setHeight(_filesData[imgNr]._detectHeight);
             aImgData._projOpts.setProjection(PanoramaOptions::STEREOGRAPHIC);

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e185a4f4a58e
changeset: 4516:e185a4f4a58e
user:      tmodes
date:       Sat Oct 23 11:19:02 2010 +0200
description:
Fixes wrong option for celeste_standalone in makefile [3092893]

diffstat:

 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r a40372434d03 -r e185a4f4a58e src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Sat Oct 23 11:18:32 2010 +0200
+++ b/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Sat Oct 23 11:19:02 2010 +0200
@@ -120,7 +120,7 @@
         {
             mf::string celesteCommand=vceleste->getRef()+" ";
             valuestream.str("");    // clear the streams buffer
-            valuestream << " -f " << celesteThreshold;
+            valuestream << " -t " << celesteThreshold;
             celesteCommand+=valuestream.str()+" ";
             if(celesteSmallRadius)
                 celesteCommand+="-r 1 ";

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a40372434d03
changeset: 4515:a40372434d03
user:      tmodes
date:       Sat Oct 23 11:18:32 2010 +0200
description:
Fixes inverted mask size for celeste [3092899]
Hugin is interpreting Celeste/Filter=1 as large,
but in celeste_standalone the parameter -r 1 is small filter size.
This behaviour is inconsistant,
but changing it would break mix existing configuration or
would be a major change to commandline parameters of celeste_standalone.

diffstat:

 src/hugin1/hugin/AssistantPanel.cpp |  2 +-
 src/hugin1/hugin/CPEditorPanel.cpp  |  2 +-
 src/hugin1/hugin/ImagesPanel.cpp    |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/AssistantPanel.cpp
--- a/src/hugin1/hugin/AssistantPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/AssistantPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -371,7 +371,7 @@
     bool runCeleste=config->Read(wxT("/Celeste/Auto"), HUGIN_CELESTE_AUTO)!=0;
     double celesteThreshold;
     config->Read(wxT("/Celeste/Threshold"), &celesteThreshold, HUGIN_CELESTE_THRESHOLD);
-    bool celesteSmall=config->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER)!=0;
+    bool celesteSmall=config->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER)==0;
     bool runCPClean=config->Read(wxT("/Assistant/AutoCPClean"), HUGIN_ASS_AUTO_CPCLEAN)!=0;
     double scale;
     config->Read(wxT("/Assistant/panoDownsizeFactor"), &scale, HUGIN_ASS_PANO_DOWNSIZE_FACTOR);
diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -2194,7 +2194,7 @@
         cfg->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
 
         // Mask resolution - 1 sets it to fine
-        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
+        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) == 0);
         int radius=(t)?10:20;
         DEBUG_TRACE("Running Celeste");
 
diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -1025,7 +1025,7 @@
         cfg->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
 
         // Mask resolution - 1 sets it to fine
-        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
+        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) == 0);
         int radius=(t)?10:20;
         DEBUG_TRACE("Running Celeste");

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/71ff850ca4cc
changeset: 4514:71ff850ca4cc
user:      harryvanderwolf <hvdwolf@...>
date:       Fri Oct 22 21:10:32 2010 +0200
description:
[OSX] minor changes to default.mac file itself

diffstat:

 src/hugin1/icpfind/default.mac |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 167209ece4a2 -r 71ff850ca4cc src/hugin1/icpfind/default.mac
--- a/src/hugin1/icpfind/default.mac	Thu Oct 21 22:53:59 2010 +0200
+++ b/src/hugin1/icpfind/default.mac	Fri Oct 22 21:10:32 2010 +0200
@@ -28,13 +28,13 @@
 
 [AutoPano/AutoPano_4]
 Type=1
-Description=Autopano-SIFT-C
+Description=Autopano-SIFT-C (Configured, not installed)
 Program=Use the Choose button to search for it
 Arguments=--maxmatches %p %o %i
 
 [AutoPano/AutoPano_5]
 Type=1
-Description=Panomatic
+Description=Panomatic (Configured, not installed)
 Program=Use the Choose button to search for it
 Arguments=-o %o %i

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/167209ece4a2
changeset: 4513:167209ece4a2
user:      harryvanderwolf <hvdwolf@...>
date:       Thu Oct 21 22:53:59 2010 +0200
description:
[OSX] Embed new CPDetector default.setting file in bundle

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  14 +++++++-------
 mac/patch-xrc.sh                    |   4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 5de70e1602a1 -r 167209ece4a2 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Thu Oct 21 17:46:34 2010 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Thu Oct 21 22:53:59 2010 +0200
@@ -2539,49 +2539,49 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 739A0C4710FA539B00D8E4C7 /* autooptimiser */;
+			remoteGlobalIDString = 739A0C4710FA539B00D8E4C7;
 			remoteInfo = autooptimiser;
 		};
 		7342A467126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 73D24B4D106152CD00B8A25D /* cpclean */;
+			remoteGlobalIDString = 73D24B4D106152CD00B8A25D;
 			remoteInfo = cpclean;
 		};
 		7342A469126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 7396E4441269806E0096D1B3 /* checkpto */;
+			remoteGlobalIDString = 7396E4441269806E0096D1B3;
 			remoteInfo = checkpto;
 		};
 		7342A46B126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 7309D40A125B9893007D4719 /* cpfind */;
+			remoteGlobalIDString = 7309D40A125B9893007D4719;
 			remoteInfo = cpfind;
 		};
 		7342A46D126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 73A95ECD124888EB0076D3FB /* icpfind dynamic */;
+			remoteGlobalIDString = 73A95ECD124888EB0076D3FB;
 			remoteInfo = "icpfind dynamic";
 		};
 		7342A46F126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 733DF623117F2268002EC787 /* pano_modify */;
+			remoteGlobalIDString = 733DF623117F2268002EC787;
 			remoteInfo = pano_modify;
 		};
 		7342A471126E01CB003FC5AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */;
+			remoteGlobalIDString = 73EBC08F0EC9E0B20068B821;
 			remoteInfo = "celeste dynamic";
 		};
 		73573E2D10F9EEA300CF0ECD /* PBXContainerItemProxy */ = {
diff -r 5de70e1602a1 -r 167209ece4a2 mac/patch-xrc.sh
--- a/mac/patch-xrc.sh	Thu Oct 21 17:46:34 2010 +0200
+++ b/mac/patch-xrc.sh	Thu Oct 21 22:53:59 2010 +0200
@@ -8,6 +8,7 @@
 huginsrcdir="../src/hugin1/hugin"
 xrcsrcdir="$huginsrcdir/xrc"
 celeste_data="../src/celeste/data"
+icpfind_default="../src/hugin1/icpfind/default.mac"
 
 rm -fR $resdir/xrc
 echo "copying xrc folder to $resdir/xrc"
@@ -46,3 +47,6 @@
 
 echo "copying celeste data"
 cp -f $celeste_data/* $resdir/xrc/
+
+echo "copying default cpdetector settings"
+cp -f $icpfind_default $resdir/xrc/default.setting

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/5de70e1602a1
changeset: 4512:5de70e1602a1
user:      tmodes
date:       Thu Oct 21 17:46:34 2010 +0200
description:
Align some text right for better structuring

diffstat:

 src/hugin1/hugin/xrc/pano_panel.xrc |  28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diffs (119 lines):

diff -r 3afe982162b5 -r 5de70e1602a1 src/hugin1/hugin/xrc/pano_panel.xrc
--- a/src/hugin1/hugin/xrc/pano_panel.xrc	Thu Oct 21 01:00:59 2010 +0100
+++ b/src/hugin1/hugin/xrc/pano_panel.xrc	Thu Oct 21 17:46:34 2010 +0200
@@ -198,7 +198,7 @@
                 </object>
                 <object class="sizeritem">
                   <cellpos>1,1</cellpos>
-                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <object class="wxStaticText">
                     <label>Horizontal:</label>
                   </object>
@@ -212,7 +212,7 @@
                 </object>
                 <object class="sizeritem">
                   <cellpos>1,3</cellpos>
-                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <object class="wxStaticText">
                     <label>Vertical:</label>
                   </object>
@@ -272,7 +272,7 @@
                   <object class="wxStaticText">
                     <label>Width:</label>
                   </object>
-                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>2,1</cellpos>
                 </object>
                 <object class="sizeritem">
@@ -286,9 +286,8 @@
                 <object class="sizeritem">
                   <object class="wxStaticText">
                     <label>Height:</label>
-                    <style>wxALIGN_RIGHT</style>
                   </object>
-                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>2,3</cellpos>
                 </object>
                 <object class="sizeritem">
@@ -346,7 +345,7 @@
                   <object class="wxStaticText">
                     <label>Left:</label>
                   </object>
-                  <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxTOP|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>6</border>
                   <cellpos>3,1</cellpos>
                 </object>
@@ -363,9 +362,8 @@
                 <object class="sizeritem">
                   <object class="wxStaticText">
                     <label>Top:</label>
-                    <style>wxALIGN_RIGHT</style>
                   </object>
-                  <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxTOP|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>6</border>
                   <cellpos>3,3</cellpos>
                 </object>
@@ -382,9 +380,8 @@
                 <object class="sizeritem">
                   <object class="wxStaticText">
                     <label>Right:</label>
-                    <style>wxALIGN_RIGHT</style>
                   </object>
-                  <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxBOTTOM|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>6</border>
                   <cellpos>4,1</cellpos>
                 </object>
@@ -400,9 +397,8 @@
                 <object class="sizeritem">
                   <object class="wxStaticText">
                     <label>Bottom:</label>
-                    <style>wxALIGN_RIGHT</style>
                   </object>
-                  <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxBOTTOM|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>6</border>
                   <cellpos>4,3</cellpos>
                 </object>
@@ -496,7 +492,7 @@
                   <object class="wxStaticText" name="pano_output_ldr_format_label">
                     <label>Format:</label>
                   </object>
-                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>8,1</cellpos>
                   <cellspan>1,1</cellspan>
                 </object>
@@ -517,7 +513,7 @@
                   <object class="wxStaticText" name="pano_output_ldr_format_options_label">
                     <label>Compression:</label>
                   </object>
-                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>8,3</cellpos>
                   <cellspan>1,1</cellspan>
                 </object>
@@ -566,7 +562,7 @@
                   <object class="wxStaticText" name="pano_output_hdr_format_label">
                     <label>Format:</label>
                   </object>
-                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>10,1</cellpos>
                   <cellspan>1,1</cellspan>
                 </object>
@@ -586,7 +582,7 @@
                   <object class="wxStaticText" name="pano_output_hdr_opts_tiff_compression_label">
                     <label>Compression:</label>
                   </object>
-                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <cellpos>10,3</cellpos>
                   <cellspan>1,1</cellspan>
                 </object>

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3afe982162b5
changeset: 4511:3afe982162b5
user:      James Legg <jlegg@...>
date:       Thu Oct 21 01:00:59 2010 +0100
description:
Convert zoom combo boxes into choice boxes.
* The text box looks like you can type your own zoom ratio, but it is read only.
* There is no point in being able to select the text.

diffstat:

 src/hugin1/hugin/CPEditorPanel.cpp         |  18 +++++++++---------
 src/hugin1/hugin/MaskEditorPanel.cpp       |   8 ++++----
 src/hugin1/hugin/xrc/cp_editor_panel.xrc   |   3 +--
 src/hugin1/hugin/xrc/mask_editor_panel.xrc |   3 +--
 4 files changed, 15 insertions(+), 17 deletions(-)

diffs (157 lines):

diff -r cf493904f8aa -r 3afe982162b5 src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Wed Oct 20 20:58:16 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Thu Oct 21 01:00:59 2010 +0100
@@ -105,7 +105,7 @@
 #endif
     EVT_LIST_ITEM_SELECTED(XRCID("cp_editor_cp_list"), CPEditorPanel::OnCPListSelect)
     EVT_LIST_COL_END_DRAG(XRCID("cp_editor_cp_list"), CPEditorPanel::OnColumnWidthChange)
-    EVT_COMBOBOX(XRCID("cp_editor_zoom_box"), CPEditorPanel::OnZoom)
+    EVT_CHOICE(XRCID("cp_editor_choice_zoom"), CPEditorPanel::OnZoom)
     EVT_TEXT_ENTER(XRCID("cp_editor_x1"), CPEditorPanel::OnTextPointChange )
     EVT_TEXT_ENTER(XRCID("cp_editor_y1"), CPEditorPanel::OnTextPointChange )
     EVT_TEXT_ENTER(XRCID("cp_editor_x2"), CPEditorPanel::OnTextPointChange )
@@ -296,7 +296,7 @@
     m_estimateCB->Disable();
     XRCCTRL(*this, "cp_editor_finetune_button", wxButton)->Disable();
     XRCCTRL(*this, "cp_editor_celeste_button", wxButton)->Disable();
-    XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Disable();
+    XRCCTRL(*this, "cp_editor_choice_zoom", wxChoice)->Disable();
     XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Disable();
     XRCCTRL(*this, "cp_editor_next_img", wxButton)->Disable();
 #ifdef HUGIN_CP_IMG_CHOICE
@@ -306,7 +306,7 @@
 
     // apply zoom specified in xrc file
     wxCommandEvent dummy;
-    dummy.SetInt(XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection());
+    dummy.SetInt(XRCCTRL(*this,"cp_editor_choice_zoom",wxChoice)->GetSelection());
     OnZoom(dummy);
 
     SetSizer( topsizer );
@@ -1293,7 +1293,7 @@
       m_estimateCB->Disable();
 	  XRCCTRL(*this, "cp_editor_finetune_button", wxButton)->Disable();
 	  XRCCTRL(*this, "cp_editor_celeste_button", wxButton)->Disable();
-	  XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Disable();
+	  XRCCTRL(*this, "cp_editor_choice_zoom", wxChoice)->Disable();
 	  XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Disable();
 	  XRCCTRL(*this, "cp_editor_next_img", wxButton)->Disable();
 #ifdef HUGIN_CP_IMG_CHOICE
@@ -1308,7 +1308,7 @@
       m_estimateCB->Enable();
 	  XRCCTRL(*this, "cp_editor_finetune_button", wxButton)->Enable();
 	  XRCCTRL(*this, "cp_editor_celeste_button", wxButton)->Enable();
-	  XRCCTRL(*this, "cp_editor_zoom_box", wxComboBox)->Enable();
+	  XRCCTRL(*this, "cp_editor_choice_zoom", wxChoice)->Enable();
 	  XRCCTRL(*this, "cp_editor_previous_img", wxButton)->Enable();
 	  XRCCTRL(*this, "cp_editor_next_img", wxButton)->Enable();
 #ifdef HUGIN_CP_IMG_CHOICE
@@ -1849,17 +1849,17 @@
         wxCommandEvent dummy;
         dummy.SetInt(1);
         OnZoom(dummy);
-        XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->SetSelection(1);
+        XRCCTRL(*this,"cp_editor_choiec_zoom",wxChoice)->SetSelection(1);
     } else if (e.m_keyCode == '1') {
         wxCommandEvent dummy;
         dummy.SetInt(0);
         OnZoom(dummy);
-        XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->SetSelection(0);
+        XRCCTRL(*this,"cp_editor_choice_zoom",wxChoice)->SetSelection(0);
     } else if (e.m_keyCode == '2') {
         wxCommandEvent dummy;
         dummy.SetInt(2);
         OnZoom(dummy);
-        XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->SetSelection(2);
+        XRCCTRL(*this,"cp_editor_choice_zoom",wxChoice)->SetSelection(2);
 
 #if 0
     } else if (e.m_keyCode == 'p') {
@@ -2059,7 +2059,7 @@
         if (cpCreationState != NO_POINT) {
             // reset zoom to previous setting
             wxCommandEvent tmpEvt;
-            tmpEvt.SetInt(XRCCTRL(*this,"cp_editor_zoom_box",wxComboBox)->GetSelection());
+            tmpEvt.SetInt(XRCCTRL(*this,"cp_editor_choice_zoom",wxChoice)->GetSelection());
             OnZoom(tmpEvt);
             m_leftImg->clearNewPoint();
             m_rightImg->clearNewPoint();
diff -r cf493904f8aa -r 3afe982162b5 src/hugin1/hugin/MaskEditorPanel.cpp
--- a/src/hugin1/hugin/MaskEditorPanel.cpp	Wed Oct 20 20:58:16 2010 +0200
+++ b/src/hugin1/hugin/MaskEditorPanel.cpp	Thu Oct 21 01:00:59 2010 +0100
@@ -47,7 +47,7 @@
     EVT_LIST_ITEM_SELECTED(XRCID("mask_editor_mask_list"), MaskEditorPanel::OnMaskSelect)
     EVT_LIST_ITEM_DESELECTED(XRCID("mask_editor_mask_list"), MaskEditorPanel::OnMaskSelect)
     EVT_LIST_COL_END_DRAG(XRCID("mask_editor_mask_list"), MaskEditorPanel::OnColumnWidthChange)
-    EVT_COMBOBOX(XRCID("mask_editor_zoom_box"), MaskEditorPanel::OnZoom)
+    EVT_CHOICE(XRCID("mask_editor_choice_zoom"), MaskEditorPanel::OnZoom)
     EVT_CHOICE(XRCID("mask_editor_choice_masktype"), MaskEditorPanel::OnMaskTypeChange)
     EVT_BUTTON(XRCID("mask_editor_add"), MaskEditorPanel::OnMaskAdd)
     EVT_BUTTON(XRCID("mask_editor_load"), MaskEditorPanel::OnMaskLoad)
@@ -132,7 +132,7 @@
     m_maskType = XRCCTRL(*this, "mask_editor_choice_masktype", wxChoice);
     // disable some controls
     m_maskType->Disable();
-    XRCCTRL(*this, "mask_editor_zoom_box", wxComboBox)->Disable();
+    XRCCTRL(*this, "mask_editor_choice_zoom", wxChoice)->Disable();
     XRCCTRL(*this, "mask_editor_add", wxButton)->Disable();
     XRCCTRL(*this, "mask_editor_load", wxButton)->Disable();
     XRCCTRL(*this, "mask_editor_save", wxButton)->Disable();
@@ -140,7 +140,7 @@
 
     // apply zoom specified in xrc file
     wxCommandEvent dummy;
-    dummy.SetInt(XRCCTRL(*this,"mask_editor_zoom_box",wxComboBox)->GetSelection());
+    dummy.SetInt(XRCCTRL(*this,"mask_editor_choice_zoom",wxChoice)->GetSelection());
     OnZoom(dummy);
     return true;
 }
@@ -193,7 +193,7 @@
         setMask(UINT_MAX);
     // enables or disables controls
     bool enableCtrl=(imgNr<UINT_MAX);
-    XRCCTRL(*this, "mask_editor_zoom_box", wxComboBox)->Enable(enableCtrl);
+    XRCCTRL(*this, "mask_editor_choice_zoom", wxChoice)->Enable(enableCtrl);
     XRCCTRL(*this, "mask_editor_add", wxButton)->Enable(enableCtrl);
     XRCCTRL(*this, "mask_editor_delete", wxButton)->Enable(enableCtrl && m_MaskNr<UINT_MAX);
     XRCCTRL(*this, "mask_editor_load", wxButton)->Enable(enableCtrl);
diff -r cf493904f8aa -r 3afe982162b5 src/hugin1/hugin/xrc/cp_editor_panel.xrc
--- a/src/hugin1/hugin/xrc/cp_editor_panel.xrc	Wed Oct 20 20:58:16 2010 +0200
+++ b/src/hugin1/hugin/xrc/cp_editor_panel.xrc	Thu Oct 21 01:00:59 2010 +0100
@@ -214,7 +214,7 @@
                         </object>
                         <object class="sizeritem">
                           <option>1</option>
-                          <object class="wxComboBox" name="cp_editor_zoom_box">
+                          <object class="wxChoice" name="cp_editor_choice_zoom">
                             <content>
                               <item>100%</item>
                               <item>fit to window</item>
@@ -225,7 +225,6 @@
                               <item>25%</item>
                             </content>
                             <selection>1</selection>
-                            <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                           </object>
                           <flag>wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
diff -r cf493904f8aa -r 3afe982162b5 src/hugin1/hugin/xrc/mask_editor_panel.xrc
--- a/src/hugin1/hugin/xrc/mask_editor_panel.xrc	Wed Oct 20 20:58:16 2010 +0200
+++ b/src/hugin1/hugin/xrc/mask_editor_panel.xrc	Thu Oct 21 01:00:59 2010 +0100
@@ -103,7 +103,7 @@
                 <border>3</border>
               </object>
               <object class="sizeritem">
-                <object class="wxComboBox" name="mask_editor_zoom_box">
+                <object class="wxChoice" name="mask_editor_choice_zoom">
                   <content>
                     <item>100%</item>
                     <item>fit to window</item>
@@ -114,7 +114,6 @@
                     <item>25%</item>
                   </content>
                   <selection>1</selection>
-                  <style>wxCB_DROPDOWN|wxCB_READONLY</style>
                 </object>
                 <option>1</option>
                 <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/cf493904f8aa
changeset: 4510:cf493904f8aa
user:      tmodes
date:       Wed Oct 20 20:58:16 2010 +0200
description:
Remove caption from wxMessageDialog for Unix and Apple
It is required by Windows User Experience Interaction Guidelines,
but Gnome Human Interface Guidelines and Apple Human Interface Guidelines
does not want titles.

diffstat:

 src/hugin1/hugin/CPEditorPanel.cpp  |   8 +++++++
 src/hugin1/hugin/MainFrame.cpp      |   7 +++++-
 src/hugin1/hugin/PanoPanel.cpp      |   8 +++++++
 src/hugin1/ptbatcher/Batch.cpp      |   8 ++++++-
 src/hugin1/ptbatcher/BatchFrame.cpp |  40 +++++++++++++++++++++++++++++++-----
 5 files changed, 63 insertions(+), 8 deletions(-)

diffs (167 lines):

diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Wed Oct 20 19:30:33 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Wed Oct 20 20:58:16 2010 +0200
@@ -1065,7 +1065,11 @@
 #if wxCHECK_VERSION(2, 9, 0)
         wxMessageDialog dlg(this,
             _("No similar point found."),
+#ifdef _WINDOWS
             _("Hugin"),
+#else
+            wxT(""),
+#endif
             wxICON_ERROR | wxOK);
         dlg.SetExtendedMessage(wxString::Format(_("Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."),
                              res.maxi));
@@ -1074,7 +1078,11 @@
         wxMessageBox(
             wxString::Format(_("No similar point found. Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."),
                              res.maxi),
+#ifdef _WINDOWS
             _("Hugin"),
+#else
+            wxT(""),
+#endif
             wxICON_ERROR | wxOK, this);
 #endif
         return false;
diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Wed Oct 20 19:30:33 2010 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Wed Oct 20 20:58:16 2010 +0200
@@ -499,7 +499,12 @@
 {
     if (pano.isDirty()) {
         wxMessageDialog message(this,
-                                _("Save changes to the panorama before closing?"), _("Hugin"),
+                                _("Save changes to the panorama before closing?"), 
+#ifdef _WINDOWS
+                                _("Hugin"),
+#else
+                                wxT(""),
+#endif
                                 wxICON_EXCLAMATION | wxYES_NO | (cancelable? (wxCANCEL):0));
 #if wxCHECK_VERSION(2, 9, 0)
     message.SetExtendedMessage("If you close without saving, changes since your last save will be discarded");
diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/PanoPanel.cpp
--- a/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 20 19:30:33 2010 +0200
+++ b/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 20 20:58:16 2010 +0200
@@ -1299,7 +1299,11 @@
 #if wxCHECK_VERSION(2,9,0)
         wxMessageDialog dialog(this,
                 _("Are you sure you want to stitch such a large panorama?"),
+#ifdef _WINDOWS
                 _("Hugin"),
+#else
+                wxT(""),
+#endif
                 wxICON_EXCLAMATION | wxYES_NO);
         dialog.SetExtendedMessage(
                 wxString::Format(_("The panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."),
@@ -1323,7 +1327,11 @@
         wxMessageDialog dialog(this,
                 wxString::Format(_("Are you sure you want to stitch such a large panorama?\n\nThe panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."),
                         area / 1000000000.0),
+#ifdef _WINDOWS
                 _("Hugin"),
+#else
+                wxT(""),
+#endif
                 wxICON_EXCLAMATION | wxYES_NO);
 #endif
         bool result;
diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/ptbatcher/Batch.cpp
--- a/src/hugin1/ptbatcher/Batch.cpp	Wed Oct 20 19:30:33 2010 +0200
+++ b/src/hugin1/ptbatcher/Batch.cpp	Wed Oct 20 20:58:16 2010 +0200
@@ -241,7 +241,13 @@
 	{
 		if(gui)
 		{
-			wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION);
+			wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), 
+#ifdef _WINDOWS
+                _("PTBatcherGUI"),
+#else
+                wxT(""),
+#endif
+                wxYES | wxCANCEL | wxICON_INFORMATION);
 			if(message.ShowModal()==wxID_YES)
 			{
 				CancelBatch();
diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/ptbatcher/BatchFrame.cpp
--- a/src/hugin1/ptbatcher/BatchFrame.cpp	Wed Oct 20 19:30:33 2010 +0200
+++ b/src/hugin1/ptbatcher/BatchFrame.cpp	Wed Oct 20 20:58:16 2010 +0200
@@ -583,7 +583,12 @@
 	else
 	{
 		//ask user if he/she wants to load an empty project
-		wxMessageDialog message(this,_("No project selected. Open Hugin without project?"), _("Question"),
+		wxMessageDialog message(this,_("No project selected. Open Hugin without project?"), 
+#ifdef _WINDOWS
+                  _("PTBatcherGUI"),
+#else
+                  wxT(""),
+#endif
                   wxYES | wxNO | wxICON_INFORMATION );
 		if(message.ShowModal() == wxID_YES) {
 #ifdef __WXMAC__
@@ -631,8 +636,13 @@
 	bool removeErrors=false;
 	if(!m_batch->NoErrors())
 	{
-		wxMessageDialog message(this,_("There are failed projects in the list.\nRemove them also?"), _("Question"),
-										wxYES | wxNO | wxICON_INFORMATION );
+		wxMessageDialog message(this,_("There are failed projects in the list.\nRemove them also?"), 
+#ifdef _WINDOWS
+                _("PTBatcherGUI"),
+#else
+                wxT(""),
+#endif
+                wxYES | wxNO | wxICON_INFORMATION );
 		if(message.ShowModal()==wxID_YES)
 			removeErrors=true;
 	}
@@ -659,7 +669,13 @@
 	{
 		if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED)
 		{
-			wxMessageDialog message(this, _("Cannot remove project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION);
+			wxMessageDialog message(this, _("Cannot remove project in progress.\nDo you want to cancel it?"), 
+#ifdef _WINDOWS
+                _("PTBatcherGUI"),
+#else
+                wxT(""),
+#endif
+                wxYES | wxCANCEL | wxICON_INFORMATION);
 			if(message.ShowModal()==wxID_YES)
 			{
 				OnButtonSkip(event);
@@ -687,7 +703,13 @@
 	{
 		if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED)
 		{
-			wxMessageDialog message(this, _("Cannot reset project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION);
+			wxMessageDialog message(this, _("Cannot reset project in progress.\nDo you want to cancel it?"), 
+#ifdef _WINDOWS
+                _("PTBatcherGUI"),
+#else
+                wxT(""),
+#endif
+                wxYES | wxCANCEL | wxICON_INFORMATION);
 			if(message.ShowModal()==wxID_YES)
 			{
 				OnButtonSkip(event);
@@ -708,7 +730,13 @@
 {
 	if(m_batch->GetRunningCount()!=0)
 	{
-		wxMessageDialog message(this, _("Cannot reset projects in progress.\nDo you want to cancel the batch?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION);
+		wxMessageDialog message(this, _("Cannot reset projects in progress.\nDo you want to cancel the batch?"), 
+#ifdef _WINDOWS
+                _("PTBatcherGUI"),
+#else
+                wxT(""),
+#endif
+                wxYES | wxCANCEL | wxICON_INFORMATION);
 		if(message.ShowModal()==wxID_YES)
 			OnButtonCancel(event);
 	}

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3edfcd782b6a
changeset: 4509:3edfcd782b6a
user:      tmodes
date:       Wed Oct 20 19:30:33 2010 +0200
description:
Some more GUI formatting to better fit to GUI guidelines
* Don't expand buttons vertical
* Add caption to some message boxes

diffstat:

 src/hugin1/hugin/CPEditorPanel.cpp  |     4 +-
 src/hugin1/hugin/MainFrame.cpp      |     2 +-
 src/hugin1/hugin/PanoPanel.cpp      |     4 +-
 src/hugin1/hugin/xrc/pano_panel.xrc |  1207 ++++++++++++++++++----------------
 4 files changed, 635 insertions(+), 582 deletions(-)

diffs (truncated from 1327 to 500 lines):

diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Wed Oct 20 18:39:42 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Wed Oct 20 19:30:33 2010 +0200
@@ -1065,7 +1065,7 @@
 #if wxCHECK_VERSION(2, 9, 0)
         wxMessageDialog dlg(this,
             _("No similar point found."),
-            "",
+            _("Hugin"),
             wxICON_ERROR | wxOK);
         dlg.SetExtendedMessage(wxString::Format(_("Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."),
                              res.maxi));
@@ -1074,7 +1074,7 @@
         wxMessageBox(
             wxString::Format(_("No similar point found. Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."),
                              res.maxi),
-            _("No similar point found"),
+            _("Hugin"),
             wxICON_ERROR | wxOK, this);
 #endif
         return false;
diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Wed Oct 20 18:39:42 2010 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Wed Oct 20 19:30:33 2010 +0200
@@ -499,7 +499,7 @@
 {
     if (pano.isDirty()) {
         wxMessageDialog message(this,
-                                _("Save changes to the panorama before closing?"), wxT(""),
+                                _("Save changes to the panorama before closing?"), _("Hugin"),
                                 wxICON_EXCLAMATION | wxYES_NO | (cancelable? (wxCANCEL):0));
 #if wxCHECK_VERSION(2, 9, 0)
     message.SetExtendedMessage("If you close without saving, changes since your last save will be discarded");
diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/PanoPanel.cpp
--- a/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 20 18:39:42 2010 +0200
+++ b/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 20 19:30:33 2010 +0200
@@ -1299,7 +1299,7 @@
 #if wxCHECK_VERSION(2,9,0)
         wxMessageDialog dialog(this,
                 _("Are you sure you want to stitch such a large panorama?"),
-                wxT(""),
+                _("Hugin"),
                 wxICON_EXCLAMATION | wxYES_NO);
         dialog.SetExtendedMessage(
                 wxString::Format(_("The panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."),
@@ -1323,7 +1323,7 @@
         wxMessageDialog dialog(this,
                 wxString::Format(_("Are you sure you want to stitch such a large panorama?\n\nThe panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."),
                         area / 1000000000.0),
-                wxT(""),
+                _("Hugin"),
                 wxICON_EXCLAMATION | wxYES_NO);
 #endif
         bool result;
diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/xrc/pano_panel.xrc
--- a/src/hugin1/hugin/xrc/pano_panel.xrc	Wed Oct 20 18:39:42 2010 +0200
+++ b/src/hugin1/hugin/xrc/pano_panel.xrc	Wed Oct 20 19:30:33 2010 +0200
@@ -154,137 +154,160 @@
           <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
             <object class="sizeritem">
-              <object class="wxBoxSizer">
-                <orient>wxVERTICAL</orient>
+              <object class="wxGridBagSizer">
+              <!-- The projection, field of view, and crop rows could be
+                   removed, because they are all duplicated (including the
+                   numeric entries) on the fast preview.
+                   People still use them since when creating things like
+                   gores and cube faces they are located near the stitch
+                   and send to batch buttons. -->
                 <object class="sizeritem">
-                  <object class="wxGridBagSizer">
-                    <!-- The projection, field of view, and crop rows could be
-                         removed, because they are all duplicated (including the
-                         numeric entries) on the fast preview.
-                         People still use them since when creating things like
-                         gores and cube faces they are located near the stitch
-                         and send to batch buttons. -->
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Projection:</label>
-                        <font>
-                          <style platform="mac">normal</style>
-                          <family platform="mac">swiss</family>
-                          <weight>bold</weight>
-                          <size platform="mac">12</size>
-                        </font>
-                      </object>
-                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>0,0</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxChoice" name="pano_choice_pano_type">
-                        <content/>
-                        <selection>2</selection>
-                      </object>
-                      <cellpos>0,1</cellpos>
-                      <cellspan>1,5</cellspan>
+                  <object class="wxStaticText">
+                    <label>Projection:</label>
+                    <font>
+                      <style platform="mac">normal</style>
+                      <family platform="mac">swiss</family>
+                      <weight>bold</weight>
+                      <size platform="mac">12</size>
+                    </font>
+                  </object>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>0,0</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxChoice" name="pano_choice_pano_type">
+                    <content/>
+                    <selection>2</selection>
+                  </object>
+                  <cellpos>0,1</cellpos>
+                  <cellspan>1,5</cellspan>
+                  <flag>wxEXPAND</flag>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Field of View:</label>
+                    <font>
+                      <style platform="mac">normal</style>
+                      <family platform="mac">swiss</family>
+                      <weight>bold</weight>
+                      <size platform="mac">12</size>
+                    </font>
+                  </object>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>1,0</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <cellpos>1,1</cellpos>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <object class="wxStaticText">
+                    <label>Horizontal:</label>
+                  </object>
+                </object>
+                <object class="sizeritem">
+                  <cellpos>1,2</cellpos>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <object class="wxTextCtrl" name="pano_text_hfov">
+                    <size>40,-1d</size>
+                  </object>
+                </object>
+                <object class="sizeritem">
+                  <cellpos>1,3</cellpos>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <object class="wxStaticText">
+                    <label>Vertical:</label>
+                  </object>
+                </object>
+                <object class="sizeritem">
+                  <cellpos>1,4</cellpos>
+                  <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <!-- force a larger spacing between the unrelated numerical entry rows-->
+                  <border>6</border>
+                  <object class="wxTextCtrl" name="pano_text_vfov">
+                    <size>40,-1d</size>
+                  </object>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="spacer">
+                      <size>0</size>
+                      <option>1</option>
                       <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Field of View:</label>
-                        <font>
-                          <style platform="mac">normal</style>
-                          <family platform="mac">swiss</family>
-                          <weight>bold</weight>
-                          <size platform="mac">12</size>
-                        </font>
-                      </object>
-                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>1,0</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <cellpos>1,1</cellpos>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <object class="wxStaticText">
-                        <label>Horizontal:</label>
-                      </object>
-                    </object>
-                    <object class="sizeritem">
-                      <cellpos>1,2</cellpos>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <object class="wxTextCtrl" name="pano_text_hfov">
-                        <size>40,-1d</size>
-                      </object>
-                    </object>
-                    <object class="sizeritem">
-                      <cellpos>1,3</cellpos>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <object class="wxStaticText">
-                        <label>Vertical:</label>
-                      </object>
-                    </object>
-                    <object class="sizeritem">
-                      <cellpos>1,4</cellpos>
-                      <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <!-- force a larger spacing between the unrelated numerical entry rows-->
-                      <border>6</border>
-                      <object class="wxTextCtrl" name="pano_text_vfov">
-                        <size>40,-1d</size>
-                      </object>
-                    </object>
-                    <object class="sizeritem">
                       <object class="wxButton" name="pano_button_calc_fov">
-                        <!-- Gnome wants command buttons in header case, Microsoft and Apple want sentence case.
+                      <!-- Gnome wants command buttons in header case, Microsoft and Apple want sentence case.
                              I don't know about OS/2, but any label is better than none.-->
                         <label platform="win|mac|os2">Calculate field of view</label>
                         <label platform="unix">Calculate Field of View</label>
                       </object>
                       <!-- If there was an option, I would would expand the buttons horizontally only. -->
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                       <cellpos>1,5</cellpos>
                     </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Canvas Size:</label>
-                        <font>
-                          <style platform="mac">normal</style>
-                          <family platform="mac">swiss</family>
-                          <weight>bold</weight>
-                          <size platform="mac">12</size>
-                        </font>
-                      </object>
-                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>2,0</cellpos>
+                    <object class="spacer">
+                      <size>0</size>
+                      <option>1</option>
+                      <flag>wxEXPAND</flag>
                     </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Width:</label>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>2,1</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_width">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>2,2</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Height:</label>
-                        <style>wxALIGN_RIGHT</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>2,3</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_height">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <!-- force a larger spacing between the unrelated numerical entry rows-->
-                      <border>6</border>
-                      <cellpos>2,4</cellpos>
+                  </object>
+                  <!-- If there was an option, I would would expand the buttons horizontally only. -->
+                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>1,5</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Canvas Size:</label>
+                    <font>
+                      <style platform="mac">normal</style>
+                      <family platform="mac">swiss</family>
+                      <weight>bold</weight>
+                      <size platform="mac">12</size>
+                    </font>
+                  </object>
+                  <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>2,0</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Width:</label>
+                  </object>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>2,1</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="pano_val_width">
+                    <size>40,-1d</size>
+                    <style>wxTE_PROCESS_ENTER</style>
+                  </object>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>2,2</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Height:</label>
+                    <style>wxALIGN_RIGHT</style>
+                  </object>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>2,3</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="pano_val_height">
+                    <size>40,-1d</size>
+                    <style>wxTE_PROCESS_ENTER</style>
+                  </object>
+                  <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <!-- force a larger spacing between the unrelated numerical entry rows-->
+                  <border>6</border>
+                  <cellpos>2,4</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="spacer">
+                      <size>0</size>
+                      <option>1</option>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="pano_button_opt_width">
@@ -292,91 +315,113 @@
                         <label platform="win|mac|os2">Calculate optimal size</label>
                         <tooltip>Calculate optimal image size, such that the resolution in the image center stays similar</tooltip>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                       <cellpos>2,5</cellpos>
                     </object>
-                    <!-- Crop entries are split onto two rows -->
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Crop:</label>
-                        <font>
-                          <style platform="mac">normal</style>
-                          <family platform="mac">swiss</family>
-                          <weight>bold</weight>
-                          <size platform="mac">12</size>
-                        </font>
-                      </object>
-                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>3,0</cellpos>
+                    <object class="spacer">
+                      <size>0</size>
+                      <option>1</option>
+                      <flag>wxEXPAND</flag>
                     </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Left:</label>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>3,1</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_roi_left">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag>
-                      <!-- force a larger spacing between the unrelated numerical entry rows-->
-                      <border>6</border>
-                      <cellpos>3,2</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Top:</label>
-                        <style>wxALIGN_RIGHT</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>3,3</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_roi_top">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag>
-                      <!-- force a larger spacing between the unrelated numerical entry rows-->
-                      <border>6</border>
-                      <cellpos>3,4</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Right:</label>
-                        <style>wxALIGN_RIGHT</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>4,1</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_roi_right">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM</flag>
-                      <border>6</border>
-                      <cellpos>4,2</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Bottom:</label>
-                        <style>wxALIGN_RIGHT</style>
-                      </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <cellpos>4,3</cellpos>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxTextCtrl" name="pano_val_roi_bottom">
-                        <size>40,-1d</size>
-                        <style>wxTE_PROCESS_ENTER</style>
-                      </object>
-                      <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                      <border>6</border>
-                      <cellpos>4,4</cellpos>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                  <cellpos>2,5</cellpos>
+                </object>
+                <!-- Crop entries are split onto two rows -->
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Crop:</label>
+                    <font>
+                      <style platform="mac">normal</style>
+                      <family platform="mac">swiss</family>
+                      <weight>bold</weight>
+                      <size platform="mac">12</size>
+                    </font>
+                  </object>
+                  <flag>wxTOP|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>6</border>
+                  <cellpos>3,0</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Left:</label>
+                  </object>
+                  <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>6</border>
+                  <cellpos>3,1</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="pano_val_roi_left">
+                    <size>40,-1d</size>
+                    <style>wxTE_PROCESS_ENTER</style>
+                  </object>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag>
+                  <!-- force a larger spacing between the unrelated numerical entry rows-->
+                  <border>6</border>
+                  <cellpos>3,2</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Top:</label>
+                    <style>wxALIGN_RIGHT</style>
+                  </object>
+                  <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>6</border>
+                  <cellpos>3,3</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="pano_val_roi_top">
+                    <size>40,-1d</size>
+                    <style>wxTE_PROCESS_ENTER</style>
+                  </object>
+                  <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag>
+                  <!-- force a larger spacing between the unrelated numerical entry rows-->
+                  <border>6</border>
+                  <cellpos>3,4</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Right:</label>
+                    <style>wxALIGN_RIGHT</style>
+                  </object>
+                  <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>6</border>
+                  <cellpos>4,1</cellpos>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="pano_val_roi_right">
+                    <size>40,-1d</size>
+                    <style>wxTE_PROCESS_ENTER</style>
+                  </object>

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/69cd40772b12
changeset: 4508:69cd40772b12
user:      tmodes
date:       Wed Oct 20 18:39:42 2010 +0200
description:
Added preprocessor makefilelib test to compile with Boost 1.44

diffstat:

 src/hugin_base/makefilelib/test_util_win32.cpp |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r db393a84602f -r 69cd40772b12 src/hugin_base/makefilelib/test_util_win32.cpp
--- a/src/hugin_base/makefilelib/test_util_win32.cpp	Tue Oct 19 18:43:32 2010 +0200
+++ b/src/hugin_base/makefilelib/test_util_win32.cpp	Wed Oct 20 18:39:42 2010 +0200
@@ -34,6 +34,7 @@
 #include <windows.h>
 #include <tchar.h>
 
+#define BOOST_IOSTREAMS_USE_DEPRECATED
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/code_converter.hpp>

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/windowsSetup/rev/7f3914870b49
changeset: 24:7f3914870b49
user:      thePanz@...
date:       Wed Oct 20 11:57:23 2010 +0200
description:
Merged Italian Translation

diffstat:

 Languages/IT.nsh |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (18 lines):

diff -r 8c93eeda1a5a -r 7f3914870b49 Languages/IT.nsh
--- a/Languages/IT.nsh	Sun Oct 17 10:45:50 2010 -0400
+++ b/Languages/IT.nsh	Wed Oct 20 11:57:23 2010 +0200
@@ -1,5 +1,6 @@
   ;Italian Language strings (thepanz@...)
   LangString TEXT_WelcomePage ${LANG_ITALIAN} "Questo programma vi guiderà nell'installazione di Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nCon Hugin è possibile assemblare un mosaico di fotografie in un panorama, unire una qualsiasi serie di immagini che si sovrappongono e molto altro ancora."
+  LangString TEXT_PreReleaseWelcomePage ${LANG_ITALIAN} "ATTENZIONE: Questo software in versione alfa è altamente sperimentale. Usare a proprio rischio.$\r$\n $\r$\nQuesto programma vi guiderà nell'installazione di Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nCon Hugin è possibile assemblare un mosaico di fotografie in un panorama, unire una qualsiasi serie di immagini che si sovrappongono e molto altro ancora."
   LangString TEXT_FinishPageLink ${LANG_ITALIAN} "Visita il sito di Hugin"  
   
   LangString TEXT_ControlPointDisclaimerTitle ${LANG_ITALIAN} "Disclaimer del generatore di punti di controllo"
@@ -39,6 +40,7 @@
   LangString DESC_SecShortcutDesktop ${LANG_ITALIAN} "Crea un'icona di Hugin sul Desktop"
   LangString TEXT_SecShortcutDesktop ${LANG_ITALIAN} "Aggiungi al Desktop"
   
+
   LangString TEXT_ERROR_DownloadFailed ${LANG_ITALIAN} "Scaricamento non riuscito: $0"
   LangString TEXT_SecCleanRegistrySettings ${LANG_ITALIAN} "Elimina le impostazioni dal registro di Windows"
   LangString DESC_SecCleanRegistrySettings ${LANG_ITALIAN} "Elimina le impostazioni dal registro di Windows"

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/db393a84602f
changeset: 4507:db393a84602f
user:      harryvanderwolf <hvdwolf@...>
date:       Tue Oct 19 18:43:32 2010 +0200
description:
[OSX] Minor changes to XCode project

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  105 +++++++++++++++++++++++++++++++++--
 1 files changed, 98 insertions(+), 7 deletions(-)

diffs (175 lines):

diff -r bc9a38b15b66 -r db393a84602f mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Tue Oct 19 13:44:56 2010 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Tue Oct 19 18:43:32 2010 +0200
@@ -16,6 +16,13 @@
 				73FC2AEE1100574300EAB009 /* PBXTargetDependency */,
 				571046850D25F6A1006A3C69 /* PBXTargetDependency */,
 				571046830D25F6A1006A3C69 /* PBXTargetDependency */,
+				7342A466126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A468126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A46A126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A46C126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A46E126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A470126E01CB003FC5AB /* PBXTargetDependency */,
+				7342A472126E01CB003FC5AB /* PBXTargetDependency */,
 			);
 			name = "bundled tools";
 			productName = "bundled tools";
@@ -1175,7 +1182,7 @@
 		736D8A641256693600602FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		736D8A7512566C1D00602FC6 /* Semaphore.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AB6124914FE0002E246 /* Semaphore.cxx */; };
 		736D8A7D12566CA900602FC6 /* ThreadOps.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AC0124914FE0002E246 /* ThreadOps.cxx */; };
-		7376415D125E6459005B7562 /* cpfind in Resources */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
+		7376415D125E6459005B7562 /* cpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
 		73764163125E6475005B7562 /* cpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
 		7377C6BB106402DC002EF919 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		7377C6C110640349002EF919 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
@@ -1741,7 +1748,7 @@
 		73F161C9118EB72A002FC7DD /* libiconv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73F161C7118EB72A002FC7DD /* libiconv.a */; };
 		73F161CA118EB743002FC7DD /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52E0E86CF120020D514 /* libIlmThread.a */; };
 		73F161D8118EB8CC002FC7DD /* Transforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 73F161D7118EB8CC002FC7DD /* Transforms.h */; };
-		73FC2AFF110057FC00EAB009 /* align_image_stack in Resources */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
+		73FC2AFF110057FC00EAB009 /* align_image_stack in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
 		73FE2A7E124912A00002E246 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73FE2AC9124915E90002E246 /* AtomicCount.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2A92124914FE0002E246 /* AtomicCount.cxx */; };
 		73FE2ACA124915E90002E246 /* ConcurrentExecutor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2A94124914FE0002E246 /* ConcurrentExecutor.cxx */; };
@@ -2528,6 +2535,55 @@
 			remoteGlobalIDString = 7309D40A125B9893007D4719;
 			remoteInfo = cpfind;
 		};
+		7342A465126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 739A0C4710FA539B00D8E4C7 /* autooptimiser */;
+			remoteInfo = autooptimiser;
+		};
+		7342A467126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73D24B4D106152CD00B8A25D /* cpclean */;
+			remoteInfo = cpclean;
+		};
+		7342A469126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7396E4441269806E0096D1B3 /* checkpto */;
+			remoteInfo = checkpto;
+		};
+		7342A46B126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7309D40A125B9893007D4719 /* cpfind */;
+			remoteInfo = cpfind;
+		};
+		7342A46D126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73A95ECD124888EB0076D3FB /* icpfind dynamic */;
+			remoteInfo = "icpfind dynamic";
+		};
+		7342A46F126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 733DF623117F2268002EC787 /* pano_modify */;
+			remoteInfo = pano_modify;
+		};
+		7342A471126E01CB003FC5AB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */;
+			remoteInfo = "celeste dynamic";
+		};
 		73573E2D10F9EEA300CF0ECD /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -3111,9 +3167,11 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				73FC2AFF110057FC00EAB009 /* align_image_stack in Copy Executable Files */,
 				7359F23A126A191A00D3291B /* autooptimiser in Copy Executable Files */,
 				7359F23B126A191A00D3291B /* celeste_standalone in Copy Executable Files */,
 				7359F23C126A191A00D3291B /* cpclean in Copy Executable Files */,
+				7376415D125E6459005B7562 /* cpfind in Copy Executable Files */,
 				7359F23D126A191A00D3291B /* icpfind in Copy Executable Files */,
 				7359F23E126A191A00D3291B /* pano_modify in Copy Executable Files */,
 				7359F22D126A18C900D3291B /* checkpto in Copy Executable Files */,
@@ -9344,7 +9402,10 @@
 				733609871247DA6D009225D2 /* icpfind */,
 				733467E81183644D00401093 /* localfeatures */,
 				571046810D25F698006A3C69 /* bundled tools */,
+				73E79F0C0D674EAC00C07126 /* align_image_stack */,
 				739A0C4710FA539B00D8E4C7 /* autooptimiser */,
+				73C153671052E6DE00AE93C1 /* calibrate_lens */,
+				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
 				73D24B4D106152CD00B8A25D /* cpclean */,
 				7396E4441269806E0096D1B3 /* checkpto */,
 				7309D40A125B9893007D4719 /* cpfind */,
@@ -9357,9 +9418,6 @@
 				739A0DBC10FA5FB700D8E4C7 /* pto2mk */,
 				733DF653117F2384002EC787 /* pto_merge */,
 				739A0CED10FA56D300D8E4C7 /* tca_correct */,
-				73E79F0C0D674EAC00C07126 /* align_image_stack */,
-				73C153671052E6DE00AE93C1 /* calibrate_lens */,
-				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
 				7364216F10763A22000121C5 /* deghosting_mask */,
 				7332AE910D8D4986002BF5FF /* matchpoint */,
 				734BDF5A0EB8EC19007EBA09 /* PTBatcher */,
@@ -9486,8 +9544,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				73FC2AFF110057FC00EAB009 /* align_image_stack in Resources */,
-				7376415D125E6459005B7562 /* cpfind in Resources */,
 				57E347780C4A9005006AA781 /* Hugin.icns in Resources */,
 				57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */,
 				5769F8940D23AB7300A6AD01 /* HuginStitchProject.app in Resources */,
@@ -11178,6 +11234,41 @@
 			target = 7309D40A125B9893007D4719 /* cpfind */;
 			targetProxy = 7340663E125BA9DB00FC4790 /* PBXContainerItemProxy */;
 		};
+		7342A466126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 739A0C4710FA539B00D8E4C7 /* autooptimiser */;
+			targetProxy = 7342A465126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A468126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73D24B4D106152CD00B8A25D /* cpclean */;
+			targetProxy = 7342A467126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A46A126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7396E4441269806E0096D1B3 /* checkpto */;
+			targetProxy = 7342A469126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A46C126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7309D40A125B9893007D4719 /* cpfind */;
+			targetProxy = 7342A46B126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A46E126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73A95ECD124888EB0076D3FB /* icpfind dynamic */;
+			targetProxy = 7342A46D126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A470126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 733DF623117F2268002EC787 /* pano_modify */;
+			targetProxy = 7342A46F126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
+		7342A472126E01CB003FC5AB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73EBC08F0EC9E0B20068B821 /* celeste dynamic */;
+			targetProxy = 7342A471126E01CB003FC5AB /* PBXContainerItemProxy */;
+		};
 		73573E2C10F9EEA300CF0ECD /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 5769FE370D24CFEC00A6AD01 /* vigra_impex Framework */;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/bc9a38b15b66
changeset: 4506:bc9a38b15b66
user:      harryvanderwolf <hvdwolf@...>
date:       Tue Oct 19 13:44:56 2010 +0200
description:
[OSX] move hugins patent free cpdetectors from Resources to MacOS; Abandon old strategy (even before plugins) where (license bound) CPdetectors were installed in Resources

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj         |  375 +++++----------------------
 mac/PTBatcherGUI-Info.plist                 |    4 +-
 src/hugin1/icpfind/AutoCtrlPointCreator.cpp |    3 +-
 3 files changed, 78 insertions(+), 304 deletions(-)

diffs (truncated from 833 to 500 lines):

diff -r 6f814fb82c21 -r bc9a38b15b66 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Mon Oct 18 21:14:27 2010 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Tue Oct 19 13:44:56 2010 +0200
@@ -910,51 +910,6 @@
 		732BA252125D0A8C00B0D33A /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
 		732BA253125D0A8C00B0D33A /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
 		732BA254125D0A8C00B0D33A /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
-		732EBD08126B8373008E5965 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
-		732EBD09126B8373008E5965 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
-		732EBD0A126B8373008E5965 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
-		732EBD0B126B8373008E5965 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
-		732EBD0C126B8373008E5965 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
-		732EBD0D126B8373008E5965 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
-		732EBD0E126B8373008E5965 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
-		732EBD0F126B8373008E5965 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
-		732EBD10126B8373008E5965 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
-		732EBD11126B8373008E5965 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
-		732EBD12126B8373008E5965 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
-		732EBD13126B8373008E5965 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
-		732EBD14126B8373008E5965 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
-		732EBD16126B8373008E5965 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
-		732EBD17126B8373008E5965 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
-		732EBD18126B8373008E5965 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
-		732EBD19126B8373008E5965 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
-		732EBD1A126B8373008E5965 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
-		732EBD1B126B8373008E5965 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
-		732EBD1C126B8373008E5965 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
-		732EBD1D126B8373008E5965 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
-		732EBD1E126B8373008E5965 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
-		732EBD1F126B8373008E5965 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
-		732EBD20126B8373008E5965 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
-		732EBD22126B8373008E5965 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
-		732EBD23126B8373008E5965 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
-		732EBD24126B8373008E5965 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
-		732EBD25126B8373008E5965 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
-		732EBD26126B8373008E5965 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
-		732EBD27126B8373008E5965 /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
-		732EBD28126B8373008E5965 /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
-		732EBD29126B8373008E5965 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
-		732EBD2A126B8373008E5965 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
-		732EBD2B126B8373008E5965 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
-		732EBD2C126B8373008E5965 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
-		732EBD2D126B8373008E5965 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
-		732EBD2E126B8373008E5965 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
-		732EBD2F126B8373008E5965 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
-		732EBD30126B8373008E5965 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
-		732EBD31126B8373008E5965 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
-		732EBD32126B8373008E5965 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
-		732EBD33126B8373008E5965 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
-		732EBD34126B8373008E5965 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
-		732EBD35126B8373008E5965 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
-		732EBD36126B8373008E5965 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
 		732EBD84126B85C5008E5965 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
 		732EBD85126B85C5008E5965 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A964B2124F41870044E1DC /* Cocoa.framework */; };
 		732EBD86126B85C5008E5965 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
@@ -1221,7 +1176,7 @@
 		736D8A7512566C1D00602FC6 /* Semaphore.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AB6124914FE0002E246 /* Semaphore.cxx */; };
 		736D8A7D12566CA900602FC6 /* ThreadOps.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AC0124914FE0002E246 /* ThreadOps.cxx */; };
 		7376415D125E6459005B7562 /* cpfind in Resources */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
-		73764163125E6475005B7562 /* cpfind in Resources */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
+		73764163125E6475005B7562 /* cpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
 		7377C6BB106402DC002EF919 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		7377C6C110640349002EF919 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
 		7377C70A10641769002EF919 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
@@ -1338,7 +1293,7 @@
 		737E497C11D3FD74002BA8AE /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		737E497D11D3FD74002BA8AE /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		737E497E11D3FD74002BA8AE /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
-		737E498011D3FD74002BA8AE /* align_image_stack in Resources */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
+		737E498011D3FD74002BA8AE /* align_image_stack in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
 		737E498311D3FD74002BA8AE /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* Hugin.icns */; };
 		737E498411D3FD74002BA8AE /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; };
 		737E498511D3FD74002BA8AE /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 5769F6300D23825700A6AD01 /* HuginStitchProject.app */; };
@@ -1367,13 +1322,13 @@
 		738A875F126AE53A00DC20B6 /* tca_correct in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9BE10FB6F5B00839DF3 /* tca_correct */; };
 		738A8760126AE53A00DC20B6 /* vig_optimize in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9C210FB6F5B00839DF3 /* vig_optimize */; };
 		738A8761126AE5FB00DC20B6 /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
-		738A8782126AE8D500DC20B6 /* cpfind in Copy Resources Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
+		738A8782126AE8D500DC20B6 /* cpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
 		738A8783126AE8D500DC20B6 /* hugin_hdrmerge in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */; };
 		738A8784126AE8D500DC20B6 /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
 		738A8785126AE8D500DC20B6 /* nona in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5796FA950C4395CC006B7C6E /* nona */; };
 		738A878E126AE9C000DC20B6 /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
 		738A878F126AE9C000DC20B6 /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
-		738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Resources Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
+		738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
 		738A87EB126AEEEA00DC20B6 /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
 		738A87EC126AEEEA00DC20B6 /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
 		738A8803126AEF5400DC20B6 /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
@@ -3172,9 +3127,11 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				737E498011D3FD74002BA8AE /* align_image_stack in Copy Executable Files */,
 				7359F235126A191100D3291B /* autooptimiser in Copy Executable Files */,
 				7359F236126A191100D3291B /* celeste_standalone in Copy Executable Files */,
 				7359F237126A191100D3291B /* cpclean in Copy Executable Files */,
+				73764163125E6475005B7562 /* cpfind in Copy Executable Files */,
 				7359F238126A191100D3291B /* icpfind in Copy Executable Files */,
 				7359F239126A191100D3291B /* pano_modify in Copy Executable Files */,
 				7359F22B126A18BB00D3291B /* checkpto in Copy Executable Files */,
@@ -3245,10 +3202,12 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Executable Files */,
 				738A880B126AEF9F00DC20B6 /* autooptimiser in Copy Executable Files */,
 				738A8803126AEF5400DC20B6 /* celeste_standalone in Copy Executable Files */,
 				738A87EB126AEEEA00DC20B6 /* checkpto in Copy Executable Files */,
 				738A87EC126AEEEA00DC20B6 /* cpclean in Copy Executable Files */,
+				738A8782126AE8D500DC20B6 /* cpfind in Copy Executable Files */,
 				738A8783126AE8D500DC20B6 /* hugin_hdrmerge in Copy Executable Files */,
 				738A8784126AE8D500DC20B6 /* icpfind in Copy Executable Files */,
 				738A8785126AE8D500DC20B6 /* nona in Copy Executable Files */,
@@ -3263,8 +3222,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Resources Files */,
-				738A8782126AE8D500DC20B6 /* cpfind in Copy Resources Files */,
 			);
 			name = "Copy Resources Files";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4038,7 +3995,6 @@
 		732927AC10E4C15700D3C8CB /* LayoutRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayoutRemapper.h; path = hugin/LayoutRemapper.h; sourceTree = "<group>"; };
 		732927AD10E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PreviewLayoutLinesTool.cpp; path = hugin/PreviewLayoutLinesTool.cpp; sourceTree = "<group>"; };
 		732927AE10E4C15700D3C8CB /* PreviewLayoutLinesTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewLayoutLinesTool.h; path = hugin/PreviewLayoutLinesTool.h; sourceTree = "<group>"; };
-		732EBD3B126B8373008E5965 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7332AE560D8D491B002BF5FF /* APImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = APImage.cpp; sourceTree = "<group>"; };
 		7332AE570D8D491B002BF5FF /* APImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = APImage.h; sourceTree = "<group>"; };
 		7332AE780D8D491B002BF5FF /* COPYING */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; };
@@ -4212,6 +4168,8 @@
 		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>"; };
+		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>"; };
 		737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; };
 		737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HuginStitchProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		737E48DC11D3F8C6002BA8AE /* hugin_stitch_project-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "hugin_stitch_project-Info copy.plist"; path = "../mac/hugin_stitch_project-Info copy.plist"; sourceTree = "<group>"; };
@@ -4968,34 +4926,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		732EBD21126B8373008E5965 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				732EBD22126B8373008E5965 /* AGL.framework in Frameworks */,
-				732EBD23126B8373008E5965 /* HuginBase.framework in Frameworks */,
-				732EBD24126B8373008E5965 /* HuginVigraImpex.framework in Frameworks */,
-				732EBD25126B8373008E5965 /* libboost_thread.dylib in Frameworks */,
-				732EBD26126B8373008E5965 /* libboost_date_time.dylib in Frameworks */,
-				732EBD27126B8373008E5965 /* libboost_filesystem.dylib in Frameworks */,
-				732EBD28126B8373008E5965 /* libboost_iostreams.dylib in Frameworks */,
-				732EBD29126B8373008E5965 /* libboost_regex.dylib in Frameworks */,
-				732EBD2A126B8373008E5965 /* libboost_system.dylib in Frameworks */,
-				732EBD2B126B8373008E5965 /* libHalf.dylib in Frameworks */,
-				732EBD2C126B8373008E5965 /* libIex.dylib in Frameworks */,
-				732EBD2D126B8373008E5965 /* libIlmImf.dylib in Frameworks */,
-				732EBD2E126B8373008E5965 /* libIlmThread.dylib in Frameworks */,
-				732EBD2F126B8373008E5965 /* libImath.dylib in Frameworks */,
-				732EBD30126B8373008E5965 /* libjpeg.dylib in Frameworks */,
-				732EBD31126B8373008E5965 /* libpano13.dylib in Frameworks */,
-				732EBD32126B8373008E5965 /* libpng.dylib in Frameworks */,
-				732EBD33126B8373008E5965 /* libtiff.dylib in Frameworks */,
-				732EBD34126B8373008E5965 /* libz.dylib in Frameworks */,
-				732EBD35126B8373008E5965 /* OpenGL.framework in Frameworks */,
-				732EBD36126B8373008E5965 /* libhugin_levmar.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		7332AE980D8D4986002BF5FF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -5599,6 +5529,8 @@
 				737E48DC11D3F8C6002BA8AE /* hugin_stitch_project-Info copy.plist */,
 				737E499111D3FD74002BA8AE /* Hugin-Info copy.plist */,
 				736945F5126A235E00BD9B27 /* Hugin-Info copy 2.plist */,
+				737C2238126DB73A0096DB59 /* Hugin-Info copy 3.plist */,
+				737C228A126DB7580096DB59 /* PTBatcherGUI-Info copy.plist */,
 			);
 			path = mac;
 			sourceTree = "<group>";
@@ -6763,7 +6695,6 @@
 				737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */,
 				737E498F11D3FD74002BA8AE /* Hugin.app */,
 				7357E524124777EB0098B385 /* makefilelib-Info.plist */,
-				732EBD3B126B8373008E5965 /* libhugin_celeste.a */,
 			);
 			sourceTree = "<group>";
 		};
@@ -8141,26 +8072,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		732EBD07126B8373008E5965 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				732EBD08126B8373008E5965 /* Celeste.h in Headers */,
-				732EBD09126B8373008E5965 /* CelesteGlobals.h in Headers */,
-				732EBD0A126B8373008E5965 /* Config.h in Headers */,
-				732EBD0B126B8373008E5965 /* ContrastFilter.h in Headers */,
-				732EBD0C126B8373008E5965 /* Gabor.h in Headers */,
-				732EBD0D126B8373008E5965 /* GaborFilter.h in Headers */,
-				732EBD0E126B8373008E5965 /* GaborGlobal.h in Headers */,
-				732EBD0F126B8373008E5965 /* GaborJet.h in Headers */,
-				732EBD10126B8373008E5965 /* ImageFile.h in Headers */,
-				732EBD11126B8373008E5965 /* LogPolar.h in Headers */,
-				732EBD12126B8373008E5965 /* PGMImage.h in Headers */,
-				732EBD13126B8373008E5965 /* svm.h in Headers */,
-				732EBD14126B8373008E5965 /* Utilities.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		7332AEB90D8D4B1D002BF5FF /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -8570,9 +8481,9 @@
 			productReference = 5769F6300D23825700A6AD01 /* HuginStitchProject.app */;
 			productType = "com.apple.product-type.application";
 		};
-		5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */ = {
+		5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "hugin_hdrmerge dynamic" */;
+			buildConfigurationList = 5769F86D0D23AA5D00A6AD01 /* Build configuration list for PBXNativeTarget "hugin_hdrmerge" */;
 			buildPhases = (
 				5769F8570D23AA5D00A6AD01 /* Sources */,
 				5769F8590D23AA5D00A6AD01 /* Frameworks */,
@@ -8583,7 +8494,7 @@
 				576901E10D24D8A900A6AD01 /* PBXTargetDependency */,
 				576901DF0D24D8A900A6AD01 /* PBXTargetDependency */,
 			);
-			name = "hugin_hdrmerge dynamic";
+			name = hugin_hdrmerge;
 			productName = "sample open_close";
 			productReference = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */;
 			productType = "com.apple.product-type.tool";
@@ -8921,27 +8832,9 @@
 			productReference = 731389121182EFC500DCF373 /* libZThread.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		732EBD05126B8373008E5965 /* celeste copy */ = {
+		7332AE910D8D4986002BF5FF /* matchpoint */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 732EBD37126B8373008E5965 /* Build configuration list for PBXNativeTarget "celeste copy" */;
-			buildPhases = (
-				732EBD06126B8373008E5965 /* Copy celeste config.h */,
-				732EBD07126B8373008E5965 /* Headers */,
-				732EBD15126B8373008E5965 /* Sources */,
-				732EBD21126B8373008E5965 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "celeste copy";
-			productName = nona;
-			productReference = 732EBD3B126B8373008E5965 /* libhugin_celeste.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		7332AE910D8D4986002BF5FF /* matchpoint dynamic */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint dynamic" */;
+			buildConfigurationList = 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint" */;
 			buildPhases = (
 				7332AE960D8D4986002BF5FF /* Sources */,
 				7332AE980D8D4986002BF5FF /* Frameworks */,
@@ -8953,7 +8846,7 @@
 				7332AE920D8D4986002BF5FF /* PBXTargetDependency */,
 				7332AE940D8D4986002BF5FF /* PBXTargetDependency */,
 			);
-			name = "matchpoint dynamic";
+			name = matchpoint;
 			productName = align_image_stack;
 			productReference = 7332AEAE0D8D4986002BF5FF /* matchpoint */;
 			productType = "com.apple.product-type.tool";
@@ -9032,9 +8925,9 @@
 			productReference = 733DF66E117F2384002EC787 /* pto_merge */;
 			productType = "com.apple.product-type.tool";
 		};
-		734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */ = {
+		734BDF5A0EB8EC19007EBA09 /* PTBatcher */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher dynamic" */;
+			buildConfigurationList = 734BDF600EB8EC45007EBA09 /* Build configuration list for PBXNativeTarget "PTBatcher" */;
 			buildPhases = (
 				734BDF580EB8EC19007EBA09 /* Sources */,
 				734BDF590EB8EC19007EBA09 /* Frameworks */,
@@ -9046,7 +8939,7 @@
 				739F85000EC7803F004771D6 /* PBXTargetDependency */,
 				57D50B020F59714100CCDCB5 /* PBXTargetDependency */,
 			);
-			name = "PTBatcher dynamic";
+			name = PTBatcher;
 			productName = PTBatcher;
 			productReference = 734BDF5B0EB8EC19007EBA09 /* PTBatcher */;
 			productType = "com.apple.product-type.tool";
@@ -9181,9 +9074,9 @@
 			productReference = E8A7D9B310FB6F5A00839DF3 /* fulla */;
 			productType = "com.apple.product-type.tool";
 		};
-		739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */ = {
+		739A0C4710FA539B00D8E4C7 /* autooptimiser */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 739A0C5F10FA539B00D8E4C7 /* Build configuration list for PBXNativeTarget "autooptimiser dynamic" */;
+			buildConfigurationList = 739A0C5F10FA539B00D8E4C7 /* Build configuration list for PBXNativeTarget "autooptimiser" */;
 			buildPhases = (
 				739A0C4E10FA539B00D8E4C7 /* Sources */,
 				739A0C5010FA539B00D8E4C7 /* Frameworks */,
@@ -9194,14 +9087,14 @@
 				739A0C4A10FA539B00D8E4C7 /* PBXTargetDependency */,
 				739A0C4C10FA539B00D8E4C7 /* PBXTargetDependency */,
 			);
-			name = "autooptimiser dynamic";
+			name = autooptimiser;
 			productName = "sample open_close";
 			productReference = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */;
 			productType = "com.apple.product-type.tool";
 		};
-		739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */ = {
+		739A0CA010FA567700D8E4C7 /* vig_optimize */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 739A0CB810FA567700D8E4C7 /* Build configuration list for PBXNativeTarget "vig_optimize dynamic" */;
+			buildConfigurationList = 739A0CB810FA567700D8E4C7 /* Build configuration list for PBXNativeTarget "vig_optimize" */;
 			buildPhases = (
 				739A0CA510FA567700D8E4C7 /* Sources */,
 				739A0CA710FA567700D8E4C7 /* Frameworks */,
@@ -9212,14 +9105,14 @@
 				739A0CA110FA567700D8E4C7 /* PBXTargetDependency */,
 				739A0CA310FA567700D8E4C7 /* PBXTargetDependency */,
 			);
-			name = "vig_optimize dynamic";
+			name = vig_optimize;
 			productName = "sample open_close";
 			productReference = E8A7D9C210FB6F5B00839DF3 /* vig_optimize */;
 			productType = "com.apple.product-type.tool";
 		};
-		739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */ = {
+		739A0CED10FA56D300D8E4C7 /* tca_correct */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 739A0D0510FA56D300D8E4C7 /* Build configuration list for PBXNativeTarget "tca_correct dynamic" */;
+			buildConfigurationList = 739A0D0510FA56D300D8E4C7 /* Build configuration list for PBXNativeTarget "tca_correct" */;
 			buildPhases = (
 				739A0CF210FA56D300D8E4C7 /* Sources */,
 				739A0CF410FA56D300D8E4C7 /* Frameworks */,
@@ -9230,14 +9123,14 @@
 				739A0CEE10FA56D300D8E4C7 /* PBXTargetDependency */,
 				739A0CF010FA56D300D8E4C7 /* PBXTargetDependency */,
 			);
-			name = "tca_correct dynamic";
+			name = tca_correct;
 			productName = "sample open_close";
 			productReference = E8A7D9BE10FB6F5B00839DF3 /* tca_correct */;
 			productType = "com.apple.product-type.tool";
 		};
-		739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */ = {
+		739A0DBC10FA5FB700D8E4C7 /* pto2mk */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 739A0DD410FA5FB700D8E4C7 /* Build configuration list for PBXNativeTarget "pto2mk dynamic" */;
+			buildConfigurationList = 739A0DD410FA5FB700D8E4C7 /* Build configuration list for PBXNativeTarget "pto2mk" */;
 			buildPhases = (
 				739A0DC110FA5FB700D8E4C7 /* Sources */,
 				739A0DC310FA5FB700D8E4C7 /* Frameworks */,
@@ -9248,7 +9141,7 @@
 				739A0DBD10FA5FB700D8E4C7 /* PBXTargetDependency */,
 				739A0DBF10FA5FB700D8E4C7 /* PBXTargetDependency */,
 			);
-			name = "pto2mk dynamic";
+			name = pto2mk;
 			productName = "sample open_close";
 			productReference = E8A7D9BA10FB6F5A00839DF3 /* pto2mk */;
 			productType = "com.apple.product-type.tool";
@@ -9274,9 +9167,9 @@
 			productReference = 73A95ECE124888EB0076D3FB /* icpfind */;
 			productType = "com.apple.product-type.tool";
 		};
-		73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */ = {
+		73C153671052E6DE00AE93C1 /* calibrate_lens */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 73C153711052E70C00AE93C1 /* Build configuration list for PBXNativeTarget "calibrate_lens dynamic" */;
+			buildConfigurationList = 73C153711052E70C00AE93C1 /* Build configuration list for PBXNativeTarget "calibrate_lens" */;
 			buildPhases = (
 				73C153651052E6DE00AE93C1 /* Sources */,
 				73C153661052E6DE00AE93C1 /* Frameworks */,
@@ -9289,7 +9182,7 @@
 				E8A7DDA410FCBD0D00839DF3 /* PBXTargetDependency */,
 				E8A7DDA610FCBD0D00839DF3 /* PBXTargetDependency */,
 			);
-			name = "calibrate_lens dynamic";
+			name = calibrate_lens;
 			productName = calibrate_lens;
 			productReference = 73C153681052E6DE00AE93C1 /* calibrate_lens */;
 			productType = "com.apple.product-type.tool";
@@ -9346,9 +9239,9 @@
 			productReference = 73E6770010F8BF18001807AB /* libhugin_base.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */ = {
+		73E79F0C0D674EAC00C07126 /* align_image_stack */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 73E79F2B0D674EAC00C07126 /* Build configuration list for PBXNativeTarget "align_image_stack dynamic" */;
+			buildConfigurationList = 73E79F2B0D674EAC00C07126 /* Build configuration list for PBXNativeTarget "align_image_stack" */;
 			buildPhases = (
 				73E79F0F0D674EAC00C07126 /* Sources */,
 				73E79F110D674EAC00C07126 /* Frameworks */,
@@ -9359,7 +9252,7 @@
 				73E79F330D674EED00C07126 /* PBXTargetDependency */,
 				73E79F350D674EF400C07126 /* PBXTargetDependency */,
 			);
-			name = "align_image_stack dynamic";
+			name = align_image_stack;
 			productName = align_image_stack;
 			productReference = 73E79F300D674EAC00C07126 /* align_image_stack */;
 			productType = "com.apple.product-type.tool";
@@ -9451,20 +9344,26 @@
 				733609871247DA6D009225D2 /* icpfind */,
 				733467E81183644D00401093 /* localfeatures */,
 				571046810D25F698006A3C69 /* bundled tools */,
-				739A0C4710FA539B00D8E4C7 /* autooptimiser dynamic */,
+				739A0C4710FA539B00D8E4C7 /* autooptimiser */,
 				73D24B4D106152CD00B8A25D /* cpclean */,
 				7396E4441269806E0096D1B3 /* checkpto */,
 				7309D40A125B9893007D4719 /* cpfind */,
 				739A0C0910FA524E00D8E4C7 /* fulla dynamic */,
-				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge dynamic */,
+				5769F8460D23AA5D00A6AD01 /* hugin_hdrmerge */,
 				73A95ECD124888EB0076D3FB /* icpfind dynamic */,
 				5796FA730C4395CC006B7C6E /* nona dynamic */,
 				73573E2B10F9EEA300CF0ECD /* pano_trafo */,
 				733DF623117F2268002EC787 /* pano_modify */,
-				739A0DBC10FA5FB700D8E4C7 /* pto2mk dynamic */,
+				739A0DBC10FA5FB700D8E4C7 /* pto2mk */,
 				733DF653117F2384002EC787 /* pto_merge */,
-				739A0CED10FA56D300D8E4C7 /* tca_correct dynamic */,
-				739A0CA010FA567700D8E4C7 /* vig_optimize dynamic */,
+				739A0CED10FA56D300D8E4C7 /* tca_correct */,
+				73E79F0C0D674EAC00C07126 /* align_image_stack */,
+				73C153671052E6DE00AE93C1 /* calibrate_lens */,
+				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
+				7364216F10763A22000121C5 /* deghosting_mask */,
+				7332AE910D8D4986002BF5FF /* matchpoint */,
+				734BDF5A0EB8EC19007EBA09 /* PTBatcher */,
+				739A0CA010FA567700D8E4C7 /* vig_optimize */,
 				57E347300C4A8EDF006AA781 /* Apps */,
 				737E490C11D3FCFB002BA8AE /* Apps with extra tools */,
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
@@ -9474,6 +9373,8 @@
 				57525A240C54BC4400BF8096 /* Nona */,
 				57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */,
 				57E347330C4A8EED006AA781 /* tools */,
+				57D382C50E2369D000445A37 /* tools - other dynamic */,
+				739A0C0010FA510300D8E4C7 /* Separate tools package */,
 				57D382D00E2369FC00445A37 /* nona static */,
 				57D382ED0E236A0800445A37 /* matchpoint static */,
 				57E122570D2BE4E800743A93 /* align_image_stack static */,
@@ -9482,15 +9383,6 @@
 				576482C00C469056003AFC2F /* vig_optimize static */,
 				73C958F40DA2C9DB00E19110 /* tca_correct static */,
 				57D50B380F5971A600CCDCB5 /* celeste static */,
-				57D382C50E2369D000445A37 /* tools - other dynamic */,
-				73E79F0C0D674EAC00C07126 /* align_image_stack dynamic */,
-				73C153671052E6DE00AE93C1 /* calibrate_lens dynamic */,
-				73EBC08F0EC9E0B20068B821 /* celeste dynamic */,
-				7364216F10763A22000121C5 /* deghosting_mask */,
-				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
-				734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */,
-				739A0C0010FA510300D8E4C7 /* Separate tools package */,
-				732EBD05126B8373008E5965 /* celeste copy */,
 			);
 		};
 /* End PBXProject section */
@@ -9606,8 +9498,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				737E498011D3FD74002BA8AE /* align_image_stack in Resources */,
-				73764163125E6475005B7562 /* cpfind in Resources */,
 				737E498311D3FD74002BA8AE /* Hugin.icns in Resources */,
 				737E498411D3FD74002BA8AE /* HuginFiles.icns in Resources */,
 				737E498511D3FD74002BA8AE /* HuginStitchProject.app in Resources */,
@@ -9883,22 +9773,6 @@
 			shellPath = /bin/sh;
 			shellScript = "sed -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";
 		};
-		732EBD06126B8373008E5965 /* Copy celeste config.h */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"celeste-Config.h",
-			);
-			name = "Copy celeste config.h";
-			outputPaths = (
-				../src/celeste/Config.h,
-			);
-			runOnlyForDeploymentPostprocessing = 0;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/6f814fb82c21
changeset: 4505:6f814fb82c21
user:      harryvanderwolf <hvdwolf@...>
date:       Mon Oct 18 21:14:27 2010 +0200
description:
[OSX] more fixes to XCode for celeste_standalone

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  321 ++++++++++++++++++++++++++++++-----
 src/celeste/Main.cpp                |   35 +--
 2 files changed, 284 insertions(+), 72 deletions(-)

diffs (truncated from 584 to 500 lines):

diff -r c0e0bce81eee -r 6f814fb82c21 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Mon Oct 18 18:59:08 2010 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Mon Oct 18 21:14:27 2010 +0200
@@ -863,25 +863,15 @@
 		57EA97D90C3A940500E4965E /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; };
 		57EA97DA0C3A940500E4965E /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; };
 		730B1AEA1139B2B30014462B /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; };
+		731006C7126CAA0D00358FDA /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
+		731006C8126CAA0D00358FDA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A964B2124F41870044E1DC /* Cocoa.framework */; };
+		731006C9126CAA0D00358FDA /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
+		731006CA126CAA0D00358FDA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
+		731006D7126CAAF500358FDA /* libZThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 731389121182EFC500DCF373 /* libZThread.a */; };
 		7318CA66119D371100DBD6FD /* CalculateOverlap.h in Headers */ = {isa = PBXBuildFile; fileRef = 7318CA64119D371100DBD6FD /* CalculateOverlap.h */; };
 		7318CA67119D371100DBD6FD /* CalculateOverlap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7318CA65119D371100DBD6FD /* CalculateOverlap.cpp */; };
 		7318CA68119D371100DBD6FD /* CalculateOverlap.h in Headers */ = {isa = PBXBuildFile; fileRef = 7318CA64119D371100DBD6FD /* CalculateOverlap.h */; };
 		7318CA69119D371100DBD6FD /* CalculateOverlap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7318CA65119D371100DBD6FD /* CalculateOverlap.cpp */; };
-		732534AA125E244B00AF5B28 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
-		732534AB125E244B00AF5B28 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
-		732534AC125E244B00AF5B28 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
-		732534AD125E244B00AF5B28 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
-		732534AE125E244B00AF5B28 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
-		732534AF125E244B00AF5B28 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
-		732534B0125E244B00AF5B28 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
-		732534B1125E244B00AF5B28 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
-		732534B2125E244B00AF5B28 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
-		732534B3125E244B00AF5B28 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
-		732534B4125E244B00AF5B28 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
-		732534B5125E244B00AF5B28 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
-		732534B6125E244B00AF5B28 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
-		732534B7125E244B00AF5B28 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
-		732534B8125E244B00AF5B28 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		732534E0125E253400AF5B28 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
 		732534E1125E253400AF5B28 /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
 		732534E2125E253400AF5B28 /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
@@ -920,6 +910,55 @@
 		732BA252125D0A8C00B0D33A /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
 		732BA253125D0A8C00B0D33A /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
 		732BA254125D0A8C00B0D33A /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		732EBD08126B8373008E5965 /* Celeste.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8DE0EB38B9400CD7122 /* Celeste.h */; };
+		732EBD09126B8373008E5965 /* CelesteGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E00EB38B9400CD7122 /* CelesteGlobals.h */; };
+		732EBD0A126B8373008E5965 /* Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E20EB38B9400CD7122 /* Config.h */; };
+		732EBD0B126B8373008E5965 /* ContrastFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8E60EB38B9400CD7122 /* ContrastFilter.h */; };
+		732EBD0C126B8373008E5965 /* Gabor.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EA0EB38B9400CD7122 /* Gabor.h */; };
+		732EBD0D126B8373008E5965 /* GaborFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EC0EB38B9400CD7122 /* GaborFilter.h */; };
+		732EBD0E126B8373008E5965 /* GaborGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8ED0EB38B9400CD7122 /* GaborGlobal.h */; };
+		732EBD0F126B8373008E5965 /* GaborJet.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8EF0EB38B9400CD7122 /* GaborJet.h */; };
+		732EBD10126B8373008E5965 /* ImageFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F10EB38B9400CD7122 /* ImageFile.h */; };
+		732EBD11126B8373008E5965 /* LogPolar.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F50EB38B9500CD7122 /* LogPolar.h */; };
+		732EBD12126B8373008E5965 /* PGMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8F80EB38B9500CD7122 /* PGMImage.h */; };
+		732EBD13126B8373008E5965 /* svm.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB8FA0EB38B9500CD7122 /* svm.h */; };
+		732EBD14126B8373008E5965 /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 734FB9050EB38B9500CD7122 /* Utilities.h */; };
+		732EBD16126B8373008E5965 /* CelesteGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DF0EB38B9400CD7122 /* CelesteGlobals.cpp */; };
+		732EBD17126B8373008E5965 /* Celeste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8DD0EB38B9400CD7122 /* Celeste.cpp */; };
+		732EBD18126B8373008E5965 /* ContrastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E50EB38B9400CD7122 /* ContrastFilter.cpp */; };
+		732EBD19126B8373008E5965 /* Gabor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8E90EB38B9400CD7122 /* Gabor.cpp */; };
+		732EBD1A126B8373008E5965 /* GaborFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EB0EB38B9400CD7122 /* GaborFilter.cpp */; };
+		732EBD1B126B8373008E5965 /* GaborJet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8EE0EB38B9400CD7122 /* GaborJet.cpp */; };
+		732EBD1C126B8373008E5965 /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F00EB38B9400CD7122 /* ImageFile.cpp */; };
+		732EBD1D126B8373008E5965 /* LogPolar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F40EB38B9500CD7122 /* LogPolar.cpp */; };
+		732EBD1E126B8373008E5965 /* PGMImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F70EB38B9500CD7122 /* PGMImage.cpp */; };
+		732EBD1F126B8373008E5965 /* svm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB8F90EB38B9500CD7122 /* svm.cpp */; };
+		732EBD20126B8373008E5965 /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FB9040EB38B9500CD7122 /* Utilities.cpp */; };
+		732EBD22126B8373008E5965 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
+		732EBD23126B8373008E5965 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		732EBD24126B8373008E5965 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		732EBD25126B8373008E5965 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		732EBD26126B8373008E5965 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		732EBD27126B8373008E5965 /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		732EBD28126B8373008E5965 /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		732EBD29126B8373008E5965 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		732EBD2A126B8373008E5965 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		732EBD2B126B8373008E5965 /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		732EBD2C126B8373008E5965 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		732EBD2D126B8373008E5965 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		732EBD2E126B8373008E5965 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		732EBD2F126B8373008E5965 /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		732EBD30126B8373008E5965 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		732EBD31126B8373008E5965 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		732EBD32126B8373008E5965 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		732EBD33126B8373008E5965 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		732EBD34126B8373008E5965 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		732EBD35126B8373008E5965 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
+		732EBD36126B8373008E5965 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
+		732EBD84126B85C5008E5965 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
+		732EBD85126B85C5008E5965 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A964B2124F41870044E1DC /* Cocoa.framework */; };
+		732EBD86126B85C5008E5965 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
+		732EBD87126B85C5008E5965 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		7332AE990D8D4986002BF5FF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		7332AE9C0D8D4986002BF5FF /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		7332AE9D0D8D4986002BF5FF /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
@@ -1058,7 +1097,6 @@
 		734065BC125BA2CA00FC4790 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A96499124F40D70044E1DC /* libpthread.dylib */; };
 		734065BD125BA2CA00FC4790 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		734065BE125BA2CA00FC4790 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
-		734065BF125BA2CA00FC4790 /* libZThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 731389121182EFC500DCF373 /* libZThread.a */; };
 		734065C0125BA2CA00FC4790 /* localfeatures.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
 		734065C9125BA2F500FC4790 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E347610C4A8F7D006AA781 /* config.h */; };
 		734065CA125BA2F500FC4790 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
@@ -1122,7 +1160,6 @@
 		734FBA6B0EB3A20500CD7122 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; };
 		734FBA6C0EB3A20500CD7122 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; };
 		734FBA850EB3A40300CD7122 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; };
-		7352D78B0FCEFB5B000574FA /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
 		73573E3410F9EEA300CF0ECD /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		73573E3510F9EEA300CF0ECD /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		73573E3610F9EEA300CF0ECD /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
@@ -1750,9 +1787,6 @@
 		73F161CA118EB743002FC7DD /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73EAB52E0E86CF120020D514 /* libIlmThread.a */; };
 		73F161D8118EB8CC002FC7DD /* Transforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 73F161D7118EB8CC002FC7DD /* Transforms.h */; };
 		73FC2AFF110057FC00EAB009 /* align_image_stack in Resources */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
-		73FE2A091249065F0002E246 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
-		73FE2A0A1249065F0002E246 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
-		73FE2A0B1249065F0002E246 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		73FE2A7E124912A00002E246 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		73FE2AC9124915E90002E246 /* AtomicCount.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2A92124914FE0002E246 /* AtomicCount.cxx */; };
 		73FE2ACA124915E90002E246 /* ConcurrentExecutor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2A94124914FE0002E246 /* ConcurrentExecutor.cxx */; };
@@ -4004,6 +4038,7 @@
 		732927AC10E4C15700D3C8CB /* LayoutRemapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayoutRemapper.h; path = hugin/LayoutRemapper.h; sourceTree = "<group>"; };
 		732927AD10E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PreviewLayoutLinesTool.cpp; path = hugin/PreviewLayoutLinesTool.cpp; sourceTree = "<group>"; };
 		732927AE10E4C15700D3C8CB /* PreviewLayoutLinesTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewLayoutLinesTool.h; path = hugin/PreviewLayoutLinesTool.h; sourceTree = "<group>"; };
+		732EBD3B126B8373008E5965 /* libhugin_celeste.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_celeste.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7332AE560D8D491B002BF5FF /* APImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = APImage.cpp; sourceTree = "<group>"; };
 		7332AE570D8D491B002BF5FF /* APImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = APImage.h; sourceTree = "<group>"; };
 		7332AE780D8D491B002BF5FF /* COPYING */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; };
@@ -4895,8 +4930,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				732EBD84126B85C5008E5965 /* AGL.framework in Frameworks */,
+				732EBD85126B85C5008E5965 /* Cocoa.framework in Frameworks */,
+				732EBD86126B85C5008E5965 /* GLUT.framework in Frameworks */,
+				732EBD87126B85C5008E5965 /* OpenGL.framework in Frameworks */,
 				734065AA125BA2CA00FC4790 /* HuginBase.framework in Frameworks */,
 				734065AB125BA2CA00FC4790 /* HuginVigraImpex.framework in Frameworks */,
+				734065C0125BA2CA00FC4790 /* localfeatures.framework in Frameworks */,
 				734065AC125BA2CA00FC4790 /* libboost_date_time.dylib in Frameworks */,
 				734065AD125BA2CA00FC4790 /* libboost_filesystem.dylib in Frameworks */,
 				734065AE125BA2CA00FC4790 /* libboost_iostreams.dylib in Frameworks */,
@@ -4915,10 +4955,9 @@
 				734065BB125BA2CA00FC4790 /* libpng.dylib in Frameworks */,
 				734065BD125BA2CA00FC4790 /* libtiff.dylib in Frameworks */,
 				734065BE125BA2CA00FC4790 /* libz.dylib in Frameworks */,
-				734065BF125BA2CA00FC4790 /* libZThread.a in Frameworks */,
 				734065BC125BA2CA00FC4790 /* libpthread.dylib in Frameworks */,
 				732534F4125E264400AF5B28 /* libhugin_celeste.a in Frameworks */,
-				734065C0125BA2CA00FC4790 /* localfeatures.framework in Frameworks */,
+				731006D7126CAAF500358FDA /* libZThread.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4929,6 +4968,34 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		732EBD21126B8373008E5965 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				732EBD22126B8373008E5965 /* AGL.framework in Frameworks */,
+				732EBD23126B8373008E5965 /* HuginBase.framework in Frameworks */,
+				732EBD24126B8373008E5965 /* HuginVigraImpex.framework in Frameworks */,
+				732EBD25126B8373008E5965 /* libboost_thread.dylib in Frameworks */,
+				732EBD26126B8373008E5965 /* libboost_date_time.dylib in Frameworks */,
+				732EBD27126B8373008E5965 /* libboost_filesystem.dylib in Frameworks */,
+				732EBD28126B8373008E5965 /* libboost_iostreams.dylib in Frameworks */,
+				732EBD29126B8373008E5965 /* libboost_regex.dylib in Frameworks */,
+				732EBD2A126B8373008E5965 /* libboost_system.dylib in Frameworks */,
+				732EBD2B126B8373008E5965 /* libHalf.dylib in Frameworks */,
+				732EBD2C126B8373008E5965 /* libIex.dylib in Frameworks */,
+				732EBD2D126B8373008E5965 /* libIlmImf.dylib in Frameworks */,
+				732EBD2E126B8373008E5965 /* libIlmThread.dylib in Frameworks */,
+				732EBD2F126B8373008E5965 /* libImath.dylib in Frameworks */,
+				732EBD30126B8373008E5965 /* libjpeg.dylib in Frameworks */,
+				732EBD31126B8373008E5965 /* libpano13.dylib in Frameworks */,
+				732EBD32126B8373008E5965 /* libpng.dylib in Frameworks */,
+				732EBD33126B8373008E5965 /* libtiff.dylib in Frameworks */,
+				732EBD34126B8373008E5965 /* libz.dylib in Frameworks */,
+				732EBD35126B8373008E5965 /* OpenGL.framework in Frameworks */,
+				732EBD36126B8373008E5965 /* libhugin_levmar.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		7332AE980D8D4986002BF5FF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -5058,29 +5125,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		7352D78A0FCEFB37000574FA /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				732534AA125E244B00AF5B28 /* AGL.framework in Frameworks */,
-				732534AB125E244B00AF5B28 /* HuginBase.framework in Frameworks */,
-				732534AC125E244B00AF5B28 /* HuginVigraImpex.framework in Frameworks */,
-				732534AD125E244B00AF5B28 /* libboost_thread.dylib in Frameworks */,
-				732534AE125E244B00AF5B28 /* libHalf.dylib in Frameworks */,
-				732534AF125E244B00AF5B28 /* libIex.dylib in Frameworks */,
-				732534B0125E244B00AF5B28 /* libIlmImf.dylib in Frameworks */,
-				732534B1125E244B00AF5B28 /* libIlmThread.dylib in Frameworks */,
-				732534B2125E244B00AF5B28 /* libImath.dylib in Frameworks */,
-				732534B3125E244B00AF5B28 /* libjpeg.dylib in Frameworks */,
-				732534B4125E244B00AF5B28 /* libpano13.dylib in Frameworks */,
-				732534B5125E244B00AF5B28 /* libpng.dylib in Frameworks */,
-				732534B6125E244B00AF5B28 /* libtiff.dylib in Frameworks */,
-				732534B7125E244B00AF5B28 /* libz.dylib in Frameworks */,
-				732534B8125E244B00AF5B28 /* OpenGL.framework in Frameworks */,
-				7352D78B0FCEFB5B000574FA /* libhugin_levmar.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		73573E3310F9EEA300CF0ECD /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -5347,13 +5391,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				73FE2A7E124912A00002E246 /* libz.dylib in Frameworks */,
-				73FE2A091249065F0002E246 /* AGL.framework in Frameworks */,
-				73FE2A0A1249065F0002E246 /* GLUT.framework in Frameworks */,
-				73FE2A0B1249065F0002E246 /* OpenGL.framework in Frameworks */,
 				73A95EE412488A2A0076D3FB /* HuginBase.framework in Frameworks */,
 				73A95EE512488A2A0076D3FB /* HuginBaseWx.framework in Frameworks */,
 				73A95EE612488A2A0076D3FB /* HuginVigraImpex.framework in Frameworks */,
+				73CE4996124A667F001F0F42 /* icpfind.framework in Frameworks */,
 				73A95EE712488A2A0076D3FB /* libboost_date_time.dylib in Frameworks */,
 				73A95EE812488A2A0076D3FB /* libboost_filesystem.dylib in Frameworks */,
 				73A95EE912488A2A0076D3FB /* libboost_iostreams.dylib in Frameworks */,
@@ -5373,7 +5414,7 @@
 				73A95EF712488A530076D3FB /* libtiff.dylib in Frameworks */,
 				73A95EF812488A530076D3FB /* libwx_macu-2.8.dylib in Frameworks */,
 				73A95EF912488A530076D3FB /* libwx_macu_gl-2.8.dylib in Frameworks */,
-				73CE4996124A667F001F0F42 /* icpfind.framework in Frameworks */,
+				73FE2A7E124912A00002E246 /* libz.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5484,6 +5525,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				731006C7126CAA0D00358FDA /* AGL.framework in Frameworks */,
+				731006C8126CAA0D00358FDA /* Cocoa.framework in Frameworks */,
+				731006C9126CAA0D00358FDA /* GLUT.framework in Frameworks */,
+				731006CA126CAA0D00358FDA /* OpenGL.framework in Frameworks */,
 				73EBC0A20EC9E2ED0068B821 /* HuginVigraImpex.framework in Frameworks */,
 				73EBC0AD0EC9E3630068B821 /* libpano13.dylib in Frameworks */,
 				73EBC0AC0EC9E3540068B821 /* libboost_thread.dylib in Frameworks */,
@@ -6718,6 +6763,7 @@
 				737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */,
 				737E498F11D3FD74002BA8AE /* Hugin.app */,
 				7357E524124777EB0098B385 /* makefilelib-Info.plist */,
+				732EBD3B126B8373008E5965 /* libhugin_celeste.a */,
 			);
 			sourceTree = "<group>";
 		};
@@ -8095,6 +8141,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		732EBD07126B8373008E5965 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				732EBD08126B8373008E5965 /* Celeste.h in Headers */,
+				732EBD09126B8373008E5965 /* CelesteGlobals.h in Headers */,
+				732EBD0A126B8373008E5965 /* Config.h in Headers */,
+				732EBD0B126B8373008E5965 /* ContrastFilter.h in Headers */,
+				732EBD0C126B8373008E5965 /* Gabor.h in Headers */,
+				732EBD0D126B8373008E5965 /* GaborFilter.h in Headers */,
+				732EBD0E126B8373008E5965 /* GaborGlobal.h in Headers */,
+				732EBD0F126B8373008E5965 /* GaborJet.h in Headers */,
+				732EBD10126B8373008E5965 /* ImageFile.h in Headers */,
+				732EBD11126B8373008E5965 /* LogPolar.h in Headers */,
+				732EBD12126B8373008E5965 /* PGMImage.h in Headers */,
+				732EBD13126B8373008E5965 /* svm.h in Headers */,
+				732EBD14126B8373008E5965 /* Utilities.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		7332AEB90D8D4B1D002BF5FF /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -8708,7 +8774,6 @@
 				57D50AF80F596E9600CCDCB5 /* Copy celeste config.h */,
 				57D50ACB0F596DB700CCDCB5 /* Headers */,
 				57D50AD00F596DB700CCDCB5 /* Sources */,
-				7352D78A0FCEFB37000574FA /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -8856,6 +8921,24 @@
 			productReference = 731389121182EFC500DCF373 /* libZThread.a */;
 			productType = "com.apple.product-type.library.static";
 		};
+		732EBD05126B8373008E5965 /* celeste copy */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 732EBD37126B8373008E5965 /* Build configuration list for PBXNativeTarget "celeste copy" */;
+			buildPhases = (
+				732EBD06126B8373008E5965 /* Copy celeste config.h */,
+				732EBD07126B8373008E5965 /* Headers */,
+				732EBD15126B8373008E5965 /* Sources */,
+				732EBD21126B8373008E5965 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "celeste copy";
+			productName = nona;
+			productReference = 732EBD3B126B8373008E5965 /* libhugin_celeste.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 		7332AE910D8D4986002BF5FF /* matchpoint dynamic */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7332AEA90D8D4986002BF5FF /* Build configuration list for PBXNativeTarget "matchpoint dynamic" */;
@@ -9407,6 +9490,7 @@
 				7332AE910D8D4986002BF5FF /* matchpoint dynamic */,
 				734BDF5A0EB8EC19007EBA09 /* PTBatcher dynamic */,
 				739A0C0010FA510300D8E4C7 /* Separate tools package */,
+				732EBD05126B8373008E5965 /* celeste copy */,
 			);
 		};
 /* End PBXProject section */
@@ -9799,6 +9883,22 @@
 			shellPath = /bin/sh;
 			shellScript = "sed -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";
 		};
+		732EBD06126B8373008E5965 /* Copy celeste config.h */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"celeste-Config.h",
+			);
+			name = "Copy celeste config.h";
+			outputPaths = (
+				../src/celeste/Config.h,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cp -r celeste-Config.h ../src/celeste/Config.h";
+		};
 		737E488C11D3F3CD002BA8AE /* Copy tools into HuginStitchProject.app */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -10326,8 +10426,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				57D50AEA0F596E5300CCDCB5 /* CelesteGlobals.cpp in Sources */,
 				57D50AE90F596E5300CCDCB5 /* Celeste.cpp in Sources */,
-				57D50AEA0F596E5300CCDCB5 /* CelesteGlobals.cpp in Sources */,
 				57D50AEB0F596E5300CCDCB5 /* ContrastFilter.cpp in Sources */,
 				57D50AEC0F596E5300CCDCB5 /* Gabor.cpp in Sources */,
 				57D50AED0F596E5300CCDCB5 /* GaborFilter.cpp in Sources */,
@@ -10501,6 +10601,24 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		732EBD15126B8373008E5965 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				732EBD16126B8373008E5965 /* CelesteGlobals.cpp in Sources */,
+				732EBD17126B8373008E5965 /* Celeste.cpp in Sources */,
+				732EBD18126B8373008E5965 /* ContrastFilter.cpp in Sources */,
+				732EBD19126B8373008E5965 /* Gabor.cpp in Sources */,
+				732EBD1A126B8373008E5965 /* GaborFilter.cpp in Sources */,
+				732EBD1B126B8373008E5965 /* GaborJet.cpp in Sources */,
+				732EBD1C126B8373008E5965 /* ImageFile.cpp in Sources */,
+				732EBD1D126B8373008E5965 /* LogPolar.cpp in Sources */,
+				732EBD1E126B8373008E5965 /* PGMImage.cpp in Sources */,
+				732EBD1F126B8373008E5965 /* svm.cpp in Sources */,
+				732EBD20126B8373008E5965 /* Utilities.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		7332AE960D8D4986002BF5FF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -13234,8 +13352,12 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(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_1 = "\"$(SRCROOT)/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\"";
 				PRODUCT_NAME = hugin_celeste;
 				STRIP_STYLE = debugging;
 			};
@@ -13253,8 +13375,12 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(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_1 = "\"$(SRCROOT)/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\"";
 				PRODUCT_NAME = hugin_celeste;
 				STRIP_STYLE = debugging;
 			};
@@ -13263,6 +13389,10 @@
 		57D50ADA0F596DB700CCDCB5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = (
+					"$(RELEASE_ARCHS_32)",
+					"$(RELEASE_ARCHS_64)",
+				);
 				HEADER_SEARCH_PATHS = (
 					../src/foreign,
 					../src/hugin_base,
@@ -13274,10 +13404,12 @@
 					"$(REPOSITORY_DIR)/lib",
 					/usr/lib,
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../ExternalPrograms/repository/lib\"";
 				PRODUCT_NAME = hugin_celeste;
-				STRIP_STYLE = debugging;
+				STRIP_STYLE = "non-global";
 			};
 			name = Release;
 		};
@@ -14012,6 +14144,79 @@
 			};
 			name = Release;
 		};
+		732EBD38126B8373008E5965 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(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_1 = "\"$(SRCROOT)/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\"";
+				PRODUCT_NAME = hugin_celeste;
+				STRIP_STYLE = debugging;
+			};
+			name = Debug;
+		};
+		732EBD39126B8373008E5965 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(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_1 = "\"$(SRCROOT)/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\"";
+				PRODUCT_NAME = hugin_celeste;
+				STRIP_STYLE = debugging;
+			};
+			name = Development;
+		};
+		732EBD3A126B8373008E5965 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					"$(RELEASE_ARCHS_32)",
+					"$(RELEASE_ARCHS_64)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../src/foreign,
+					../src/hugin_base,
+					../src/foreign/vigra,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(value)",

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/c0e0bce81eee
changeset: 4504:c0e0bce81eee
user:      tmodes
date:       Mon Oct 18 18:59:08 2010 +0200
description:
Correct finding of celeste model file for MacOS in celeste_standalone

diffstat:

 src/celeste/Main.cpp |  21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r fd06e19e63a7 -r c0e0bce81eee src/celeste/Main.cpp
--- a/src/celeste/Main.cpp	Mon Oct 18 18:49:48 2010 +0200
+++ b/src/celeste/Main.cpp	Mon Oct 18 18:59:08 2010 +0200
@@ -35,6 +35,13 @@
  #include <unistd.h>
 #endif
 
+#ifdef __APPLE__
+#include <hugin_config.h>
+#include <mach-o/dyld.h>	/* _NSGetExecutablePath */
+#include <limits.h>		/* PATH_MAX */
+#include <libgen.h>		/* dirname */
+#endif
+
 using namespace std;
 using namespace HuginBase;
 using namespace AppBase;
@@ -298,7 +305,19 @@
                 install_path_model=working_path;
             }
         }
-#else
+#elif defined MAC_SELF_CONTAINED_BUNDLE
+        //string install_path_model = ("./xrc/");
+		char path[PATH_MAX + 1];
+		uint32_t size = sizeof(path);
+		string install_path_model("");
+		if (_NSGetExecutablePath(path, &size) == 0)
+		{
+			//install_path_model=path;
+			install_path_model=dirname(path);
+			install_path_model.append("/xrc/");
+			cout << "Detected path " << install_path_model << endl << endl;
+		}
+#else
         string install_path_model = (INSTALL_DATA_DIR);
 #endif

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/0c2084090adb
changeset: 4502:0c2084090adb
user:      tmodes
date:       Mon Oct 18 18:36:17 2010 +0200
description:
Added missing whitespace to makefile

diffstat:

 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 2e98140199f0 -r 0c2084090adb src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Mon Oct 18 08:53:21 2010 +0100
+++ b/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Mon Oct 18 18:36:17 2010 +0200
@@ -125,7 +125,7 @@
             if(celesteSmallRadius)
                 celesteCommand+="-r 1 ";
             echoInfo(*all,"Remove control points in clouds...");
-            all->addCommand(celesteCommand+cstr(" -o ")+vprojectShell->getRef()+cstr(" -i")+vprojectShell->getRef());
+            all->addCommand(celesteCommand+cstr(" -o ")+vprojectShell->getRef()+cstr(" -i ")+vprojectShell->getRef());
         };
         //building cpclean command
         if(runCPClean)

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/fd06e19e63a7
changeset: 4503:fd06e19e63a7
user:      tmodes
date:       Mon Oct 18 18:49:48 2010 +0200
description:
Celeste_standalone is now using getopt for command line parsing
Old implementation could result in crashs if given invalid parameters

diffstat:

 src/celeste/CMakeLists.txt |    2 +-
 src/celeste/Main.cpp       |  108 ++++++++++++++++++++++++++++++++------------
 2 files changed, 79 insertions(+), 31 deletions(-)

diffs (154 lines):

diff -r 0c2084090adb -r fd06e19e63a7 src/celeste/CMakeLists.txt
--- a/src/celeste/CMakeLists.txt	Mon Oct 18 18:36:17 2010 +0200
+++ b/src/celeste/CMakeLists.txt	Mon Oct 18 18:49:48 2010 +0200
@@ -73,7 +73,7 @@
 
 # standalone
 ADD_EXECUTABLE(celeste_standalone ../hugin_config.h  Main.cpp )
-target_link_libraries( celeste_standalone celeste ${image_libs})
+target_link_libraries( celeste_standalone celeste ${image_libs} ${common_libs})
 
 SET (CELESTE_MODEL
 	data/celeste.model
diff -r 0c2084090adb -r fd06e19e63a7 src/celeste/Main.cpp
--- a/src/celeste/Main.cpp	Mon Oct 18 18:36:17 2010 +0200
+++ b/src/celeste/Main.cpp	Mon Oct 18 18:49:48 2010 +0200
@@ -30,6 +30,9 @@
 
 #ifdef _WINDOWS
 #include <windows.h>
+#include <getopt.h>
+#else
+ #include <unistd.h>
 #endif
 
 using namespace std;
@@ -178,7 +181,8 @@
 };
 
 
-int main(int argc, const char* argv[]){
+int main(int argc, char* argv[])
+{
 
     // Exit with usage unless filename given as argument
     if (argc < 2)
@@ -187,7 +191,7 @@
     }
 
     unsigned int i = 1, mask = 0;
-	double threshold = 0.5;
+    double threshold = 0.5;
     vector<string> images_to_mask;
     string pto_file = (""),output_pto = ("");
     string mask_format = ("PNG");
@@ -196,37 +200,81 @@
     int resize_dimension=800;
 
     // Deal with arguments
-    while(i < argc)
+    // parse arguments
+    int c;
+    const char * optstring = "i:o:d:s:t:m:f:r:h";
+
+    while ((c = getopt (argc, argv, optstring)) != -1)
     {
-        if( argv[i][0] == '-'){
+        switch(c)
+        {
+            case 'h': 
+                usage();
+                break;
+            case 'i':
+                pto_file=optarg;
+                break;
+            case 'o':
+                output_pto=optarg;
+                break;
+            case 't':
+                threshold = atof(optarg);
+                if(threshold<=0 || threshold>1)
+                {
+                    cerr << "Invalid parameter: threshold (-t) should be between 0 and 1" << std::endl;
+                    return 1;
+                };
+                break;
+            case 'm': 
+                mask = atoi(optarg);
+                if(mask<0 || mask>1)
+                {
+                    cerr << "Invalid parameter: mask parameter (-m) can only be 0 or 1" << std::endl;
+                    return 1;
+                };
+                break;
+            case 'f': 
+                mask_format = optarg; 
+                break;
+            case 'd':
+                model_file = optarg;
+                break;
+            case 'r': 
+                course_fine = atoi(optarg);
+                break;
+            case 's': 
+                resize_dimension = atoi(optarg);
+                if(resize_dimension<100)
+                {
+                    cerr << "Invalid parameter: maximum dimension (-s) should be bigger than 100" << std::endl;
+                    return 1;
+                };
+                break;
+            case ':':
+                cerr <<"Missing parameter for parameter " << argv[optind] << endl;
+                return 1;
+                break;
+            case '?': /* invalid parameter */
+                return 1;
+                break;
+            default: /* unknown */
+                usage();
+        };
+    };
+
+    while(optind<argc)
+    {
+        images_to_mask.push_back(argv[optind]);
+        optind++;
+    };
     
-    	    if (argc == 2){
-		    usage();
-	    }
+    if(images_to_mask.size()==0 && pto_file.empty())
+    {
+        cout << "No project file or image files given."<< endl;
+        return 1;
+    };
+
     
-                        i++;
-                        switch(argv[i-1][1]){
-
-                                // Put some more argument options in here later
-                                case 'h' : {usage();}
-				case 'i' : {pto_file += argv[i]; break;}
-				case 'o' : {output_pto += argv[i]; break;}
-				case 't' : {threshold = atof(argv[i]); break;}
-				case 'm' : {mask = atoi(argv[i]); break;}
-				case 'f' : {mask_format = argv[i]; break;}
-				case 'd' : {model_file = argv[i]; break;}
-				case 'r' : {course_fine = atoi(argv[i]); break;}
-				case 's' : {resize_dimension = atoi(argv[i]); break;}
-                        }
-
-   
-                }else{
-			images_to_mask.push_back(argv[i]);
-                }
-
-                i++;
-        }
-
 	// Check model file
 	if (!fileexists(model_file)){

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2e98140199f0
changeset: 4501:2e98140199f0
user:      James Legg <jlegg@...>
date:       Mon Oct 18 08:53:21 2010 +0100
description:
Merge

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj                                       |  306 ++++++++-
 mac/complete-embed.sh                                                     |   10 +-
 mac/complete-tools-package.sh                                             |    2 +-
 mac/copyExtraTools.sh                                                     |   10 +-
 mac/copyPTBatcherGuiBins.sh                                               |    8 +-
 src/hugin1/hugin/xrc/data/pto_icon.ico                                    |    0 
 src/hugin1/hugin/xrc/data/pto_icon.svg                                    |  293 +++++++++
 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp |   10 -
 8 files changed, 561 insertions(+), 78 deletions(-)

diffs (truncated from 1053 to 500 lines):

diff -r dda49e5b558f -r 2e98140199f0 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Mon Oct 18 08:52:07 2010 +0100
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Mon Oct 18 08:53:21 2010 +0100
@@ -14,8 +14,6 @@
 			);
 			dependencies = (
 				73FC2AEE1100574300EAB009 /* PBXTargetDependency */,
-				7396E4761269810E0096D1B3 /* PBXTargetDependency */,
-				73D24BBD10615A4700B8A25D /* PBXTargetDependency */,
 				571046850D25F6A1006A3C69 /* PBXTargetDependency */,
 				571046830D25F6A1006A3C69 /* PBXTargetDependency */,
 			);
@@ -56,19 +54,21 @@
 			buildPhases = (
 			);
 			dependencies = (
+				73FC2AF0110057CB00EAB009 /* PBXTargetDependency */,
 				57D382CB0E2369D600445A37 /* PBXTargetDependency */,
 				73C154511052F40A00AE93C1 /* PBXTargetDependency */,
 				739A0BEE10FA4A5600D8E4C7 /* PBXTargetDependency */,
+				7359F1A21269F71B00D3291B /* PBXTargetDependency */,
+				73FC2AF2110057CB00EAB009 /* PBXTargetDependency */,
 				736421F8107640F7000121C5 /* PBXTargetDependency */,
+				73FC2AF4110057CB00EAB009 /* PBXTargetDependency */,
+				738A876A126AE6EC00DC20B6 /* PBXTargetDependency */,
 				57D382CD0E2369D600445A37 /* PBXTargetDependency */,
-				E8A7DD8A10FCB38800839DF3 /* PBXTargetDependency */,
-				73FC2AF0110057CB00EAB009 /* PBXTargetDependency */,
-				73FC2AF2110057CB00EAB009 /* PBXTargetDependency */,
-				73FC2AF4110057CB00EAB009 /* PBXTargetDependency */,
 				733DF684117F24ED002EC787 /* PBXTargetDependency */,
 				73FC2AF6110057CB00EAB009 /* PBXTargetDependency */,
 				73FC2AF8110057CB00EAB009 /* PBXTargetDependency */,
 				733DF686117F2531002EC787 /* PBXTargetDependency */,
+				E8A7DD8A10FCB38800839DF3 /* PBXTargetDependency */,
 				73FC2AFA110057CB00EAB009 /* PBXTargetDependency */,
 				73FC2AFC110057CB00EAB009 /* PBXTargetDependency */,
 			);
@@ -1139,6 +1139,18 @@
 		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 */; };
+		7359F22B126A18BB00D3291B /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
+		7359F22D126A18C900D3291B /* 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 */; };
+		7359F237126A191100D3291B /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
+		7359F238126A191100D3291B /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
+		7359F239126A191100D3291B /* pano_modify in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF63F117F2268002EC787 /* pano_modify */; };
+		7359F23A126A191A00D3291B /* autooptimiser in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; };
+		7359F23B126A191A00D3291B /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
+		7359F23C126A191A00D3291B /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
+		7359F23D126A191A00D3291B /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
+		7359F23E126A191A00D3291B /* pano_modify in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF63F117F2268002EC787 /* pano_modify */; };
 		7364217A10763A64000121C5 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		7364217C10763A6F000121C5 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		7364218610763B87000121C5 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
@@ -1163,6 +1175,11 @@
 		7364220A107641B1000121C5 /* hugin_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E122480D2BE45700743A93 /* hugin_version.h */; };
 		7368E41E108393D300519ED0 /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
 		7368E4641083ABF200519ED0 /* NumTransDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */; };
+		7369F929126B1719001B1976 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		7369F92A126B1719001B1976 /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		7369F92B126B1719001B1976 /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		7369F92C126B1719001B1976 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		7369F92D126B1719001B1976 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
 		736D8A641256693600602FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		736D8A7512566C1D00602FC6 /* Semaphore.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AB6124914FE0002E246 /* Semaphore.cxx */; };
 		736D8A7D12566CA900602FC6 /* ThreadOps.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 73FE2AC0124914FE0002E246 /* ThreadOps.cxx */; };
@@ -1173,7 +1190,6 @@
 		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 */; };
-		7377C755106422F8002EF919 /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
 		737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		737E487F11D3EA5D002BA8AE /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
 		737E48B411D3F8C6002BA8AE /* hugin_stitch_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 575670980D089B1F00344F55 /* hugin_stitch_project.cpp */; };
@@ -1296,6 +1312,36 @@
 		738A774C112B4869004E3612 /* Mask.h in Headers */ = {isa = PBXBuildFile; fileRef = 738A774A112B4869004E3612 /* Mask.h */; };
 		738A774D112B4869004E3612 /* Mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A7749112B4869004E3612 /* Mask.cpp */; };
 		738A774E112B4869004E3612 /* Mask.h in Headers */ = {isa = PBXBuildFile; fileRef = 738A774A112B4869004E3612 /* Mask.h */; };
+		738A8746126ADD5400DC20B6 /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		738A8747126ADD5400DC20B6 /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
+		738A8748126ADD7000DC20B6 /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		738A8749126ADD7000DC20B6 /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
+		738A8754126AE53A00DC20B6 /* autooptimiser in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; };
+		738A8755126AE53A00DC20B6 /* calibrate_lens in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73C153681052E6DE00AE93C1 /* calibrate_lens */; };
+		738A8756126AE53A00DC20B6 /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
+		738A8757126AE53A00DC20B6 /* deghosting_mask in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7364217010763A22000121C5 /* deghosting_mask */; };
+		738A8758126AE53A00DC20B6 /* fulla in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9B310FB6F5A00839DF3 /* fulla */; };
+		738A8759126AE53A00DC20B6 /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
+		738A875A126AE53A00DC20B6 /* matchpoint in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7332AEAE0D8D4986002BF5FF /* matchpoint */; };
+		738A875B126AE53A00DC20B6 /* pano_modify in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF63F117F2268002EC787 /* pano_modify */; };
+		738A875C126AE53A00DC20B6 /* pano_trafo in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9B710FB6F5A00839DF3 /* pano_trafo */; };
+		738A875D126AE53A00DC20B6 /* pto2mk in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9BA10FB6F5A00839DF3 /* pto2mk */; };
+		738A875E126AE53A00DC20B6 /* pto_merge in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF66E117F2384002EC787 /* pto_merge */; };
+		738A875F126AE53A00DC20B6 /* tca_correct in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9BE10FB6F5B00839DF3 /* tca_correct */; };
+		738A8760126AE53A00DC20B6 /* vig_optimize in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9C210FB6F5B00839DF3 /* vig_optimize */; };
+		738A8761126AE5FB00DC20B6 /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
+		738A8782126AE8D500DC20B6 /* cpfind in Copy Resources Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
+		738A8783126AE8D500DC20B6 /* hugin_hdrmerge in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */; };
+		738A8784126AE8D500DC20B6 /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
+		738A8785126AE8D500DC20B6 /* nona in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 5796FA950C4395CC006B7C6E /* nona */; };
+		738A878E126AE9C000DC20B6 /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		738A878F126AE9C000DC20B6 /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
+		738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Resources Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
+		738A87EB126AEEEA00DC20B6 /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
+		738A87EC126AEEEA00DC20B6 /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
+		738A8803126AEF5400DC20B6 /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
+		738A880B126AEF9F00DC20B6 /* autooptimiser in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; };
+		738A880C126AEFB000DC20B6 /* pano_modify in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF63F117F2268002EC787 /* pano_modify */; };
 		738C044B10A0A5D90061D144 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; };
 		7393CEC8115BF296002F3DCA /* hugin_shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 7393CEC7115BF296002F3DCA /* hugin_shared.h */; };
 		7393CEC9115BF296002F3DCA /* hugin_shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 7393CEC7115BF296002F3DCA /* hugin_shared.h */; };
@@ -2507,6 +2553,27 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
+		7359F1A11269F71B00D3291B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7396E4441269806E0096D1B3;
+			remoteInfo = checkpto;
+		};
+		7359F20B126A186200D3291B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382C50E2369D000445A37;
+			remoteInfo = "tools - other dynamic";
+		};
+		7359F21C126A188000D3291B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382C50E2369D000445A37;
+			remoteInfo = "tools - other dynamic";
+		};
 		7364217610763A44000121C5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -2619,6 +2686,27 @@
 			remoteGlobalIDString = 737E491B11D3FD74002BA8AE;
 			remoteInfo = "Hugin for use with extra tools";
 		};
+		738A8769126AE6EC00DC20B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73A95ECD124888EB0076D3FB;
+			remoteInfo = "icpfind dynamic";
+		};
+		738A876F126AE7ED00DC20B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7309D40A125B9893007D4719;
+			remoteInfo = cpfind;
+		};
+		738A87F2126AEF0600DC20B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382C50E2369D000445A37;
+			remoteInfo = "tools - other dynamic";
+		};
 		7396E4461269806E0096D1B3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -2633,13 +2721,6 @@
 			remoteGlobalIDString = 576900A90D24D29300A6AD01;
 			remoteInfo = "hugin_base Framework";
 		};
-		7396E4751269810E0096D1B3 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 7396E4441269806E0096D1B3 /* checkpto */;
-			remoteInfo = checkpto;
-		};
 		739A0BED10FA4A5600D8E4C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -2794,13 +2875,6 @@
 			remoteGlobalIDString = 57E3470D0C4A8E95006AA781;
 			remoteInfo = "lib static";
 		};
-		73D24BBC10615A4700B8A25D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 73D24B4D106152CD00B8A25D;
-			remoteInfo = cpclean;
-		};
 		73E677DD10F8C371001807AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
@@ -3006,6 +3080,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				738A8746126ADD5400DC20B6 /* icpfind.framework in Copy Frameworks */,
+				738A8747126ADD5400DC20B6 /* localfeatures.framework in Copy Frameworks */,
 				576902000D24DA7200A6AD01 /* HuginVigraImpex.framework in Copy Frameworks */,
 				576902010D24DA7200A6AD01 /* HuginBase.framework in Copy Frameworks */,
 				576902020D24DA7200A6AD01 /* HuginBaseWx.framework in Copy Frameworks */,
@@ -3019,7 +3095,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
-				7377C755106422F8002EF919 /* cpclean in Copy Executable Files */,
 				5769F7D20D23A26B00A6AD01 /* nona in Copy Executable Files */,
 				5769F88A0D23AB0E00A6AD01 /* hugin_hdrmerge in Copy Executable Files */,
 			);
@@ -3035,19 +3110,67 @@
 				57D50A580F595A6300CCDCB5 /* HuginVigraImpex.framework in Copy Frameworks */,
 				57D50A590F595A6300CCDCB5 /* HuginBase.framework in Copy Frameworks */,
 				57D50A5A0F595A6300CCDCB5 /* HuginBaseWx.framework in Copy Frameworks */,
+				738A878E126AE9C000DC20B6 /* icpfind.framework in Copy Frameworks */,
+				738A878F126AE9C000DC20B6 /* localfeatures.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		7359F1F4126A17FF00D3291B /* Copy Executable Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 6;
+			files = (
+				7359F23A126A191A00D3291B /* autooptimiser in Copy Executable Files */,
+				7359F23B126A191A00D3291B /* celeste_standalone in Copy Executable Files */,
+				7359F23C126A191A00D3291B /* cpclean in Copy Executable Files */,
+				7359F23D126A191A00D3291B /* icpfind in Copy Executable Files */,
+				7359F23E126A191A00D3291B /* pano_modify in Copy Executable Files */,
+				7359F22D126A18C900D3291B /* checkpto in Copy Executable Files */,
+			);
+			name = "Copy Executable Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7359F20A126A185E00D3291B /* Copy Executable Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 6;
+			files = (
+				7359F235126A191100D3291B /* autooptimiser in Copy Executable Files */,
+				7359F236126A191100D3291B /* celeste_standalone in Copy Executable Files */,
+				7359F237126A191100D3291B /* cpclean in Copy Executable Files */,
+				7359F238126A191100D3291B /* icpfind in Copy Executable Files */,
+				7359F239126A191100D3291B /* pano_modify in Copy Executable Files */,
+				7359F22B126A18BB00D3291B /* checkpto in Copy Executable Files */,
+			);
+			name = "Copy Executable Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		737E48CA11D3F8C6002BA8AE /* Copy Executable Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				738A8754126AE53A00DC20B6 /* autooptimiser in Copy Executable Files */,
+				738A8755126AE53A00DC20B6 /* calibrate_lens in Copy Executable Files */,
+				738A8756126AE53A00DC20B6 /* celeste_standalone in Copy Executable Files */,
+				738A8761126AE5FB00DC20B6 /* checkpto in Copy Executable Files */,
 				737E48CB11D3F8C6002BA8AE /* cpclean in Copy Executable Files */,
+				738A8757126AE53A00DC20B6 /* deghosting_mask in Copy Executable Files */,
+				738A8758126AE53A00DC20B6 /* fulla in Copy Executable Files */,
+				737E48CD11D3F8C6002BA8AE /* hugin_hdrmerge in Copy Executable Files */,
+				738A8759126AE53A00DC20B6 /* icpfind in Copy Executable Files */,
+				738A875A126AE53A00DC20B6 /* matchpoint in Copy Executable Files */,
+				738A875B126AE53A00DC20B6 /* pano_modify in Copy Executable Files */,
+				738A875C126AE53A00DC20B6 /* pano_trafo in Copy Executable Files */,
+				738A875D126AE53A00DC20B6 /* pto2mk in Copy Executable Files */,
+				738A875E126AE53A00DC20B6 /* pto_merge in Copy Executable Files */,
+				738A875F126AE53A00DC20B6 /* tca_correct in Copy Executable Files */,
+				738A8760126AE53A00DC20B6 /* vig_optimize in Copy Executable Files */,
 				737E48CC11D3F8C6002BA8AE /* nona in Copy Executable Files */,
-				737E48CD11D3F8C6002BA8AE /* hugin_hdrmerge in Copy Executable Files */,
 			);
 			name = "Copy Executable Files";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3058,6 +3181,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				738A8748126ADD7000DC20B6 /* icpfind.framework in Copy Frameworks */,
+				738A8749126ADD7000DC20B6 /* localfeatures.framework in Copy Frameworks */,
 				737E48CF11D3F8C6002BA8AE /* HuginVigraImpex.framework in Copy Frameworks */,
 				737E48D011D3F8C6002BA8AE /* HuginBase.framework in Copy Frameworks */,
 				737E48D111D3F8C6002BA8AE /* HuginBaseWx.framework in Copy Frameworks */,
@@ -3080,6 +3205,36 @@
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		738A877E126AE8AC00DC20B6 /* Copy Executable Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 6;
+			files = (
+				738A880B126AEF9F00DC20B6 /* autooptimiser in Copy Executable Files */,
+				738A8803126AEF5400DC20B6 /* celeste_standalone in Copy Executable Files */,
+				738A87EB126AEEEA00DC20B6 /* checkpto in Copy Executable Files */,
+				738A87EC126AEEEA00DC20B6 /* cpclean in Copy Executable Files */,
+				738A8783126AE8D500DC20B6 /* hugin_hdrmerge in Copy Executable Files */,
+				738A8784126AE8D500DC20B6 /* icpfind in Copy Executable Files */,
+				738A8785126AE8D500DC20B6 /* nona in Copy Executable Files */,
+				738A880C126AEFB000DC20B6 /* pano_modify in Copy Executable Files */,
+			);
+			name = "Copy Executable Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		738A879F126AEA8800DC20B6 /* Copy Resources Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 7;
+			files = (
+				738A87A0126AEAB000DC20B6 /* align_image_stack in Copy Resources Files */,
+				738A8782126AE8D500DC20B6 /* cpfind in Copy Resources Files */,
+			);
+			name = "Copy Resources Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -4020,6 +4175,7 @@
 		7368E40E1083930D00519ED0 /* libasprintf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libasprintf.dylib; path = lib/libasprintf.dylib; sourceTree = "<group>"; };
 		7368E4621083ABF200519ED0 /* NumTransDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumTransDialog.h; sourceTree = "<group>"; };
 		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>"; };
 		737E1C180EC9EC0300BA4D9B /* hugin_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_config.h; sourceTree = "<group>"; };
 		737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HuginStitchProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5099,6 +5255,11 @@
 				739A0C5810FA539B00D8E4C7 /* libImath.dylib in Frameworks */,
 				739A0C5910FA539B00D8E4C7 /* libHalf.dylib in Frameworks */,
 				739A0C5A10FA539B00D8E4C7 /* libpano13.dylib in Frameworks */,
+				7369F929126B1719001B1976 /* libboost_date_time.dylib in Frameworks */,
+				7369F92A126B1719001B1976 /* libboost_filesystem.dylib in Frameworks */,
+				7369F92B126B1719001B1976 /* libboost_iostreams.dylib in Frameworks */,
+				7369F92C126B1719001B1976 /* libboost_regex.dylib in Frameworks */,
+				7369F92D126B1719001B1976 /* libboost_system.dylib in Frameworks */,
 				739A0C5B10FA539B00D8E4C7 /* libboost_thread.dylib in Frameworks */,
 				739A0C5C10FA539B00D8E4C7 /* libexpat.dylib in Frameworks */,
 				739A0C5D10FA539B00D8E4C7 /* HuginVigraImpex.framework in Frameworks */,
@@ -5392,6 +5553,7 @@
 				739193E81119FC73007D96F4 /* Hugin-Info copy.plist */,
 				737E48DC11D3F8C6002BA8AE /* hugin_stitch_project-Info copy.plist */,
 				737E499111D3FD74002BA8AE /* Hugin-Info copy.plist */,
+				736945F5126A235E00BD9B27 /* Hugin-Info copy 2.plist */,
 			);
 			path = mac;
 			sourceTree = "<group>";
@@ -5646,22 +5808,24 @@
 		573B9041067BAEA700B7B355 /* tools-dynamic */ = {
 			isa = PBXGroup;
 			children = (
-				73A95ECE124888EB0076D3FB /* icpfind */,
-				733DF63F117F2268002EC787 /* pano_modify */,
-				733DF66E117F2384002EC787 /* pto_merge */,
 				73E79F300D674EAC00C07126 /* align_image_stack */,
 				E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */,
 				73C153681052E6DE00AE93C1 /* calibrate_lens */,
 				73EBC0900EC9E0B20068B821 /* celeste_standalone */,
+				7309D40B125B9893007D4719 /* cpfind */,
+				7396E4601269806E0096D1B3 /* checkpto */,
 				73D24B4E106152CD00B8A25D /* cpclean */,
 				7364217010763A22000121C5 /* deghosting_mask */,
 				E8A7D9B310FB6F5A00839DF3 /* fulla */,
 				5769F8720D23AA5D00A6AD01 /* hugin_hdrmerge */,
+				73A95ECE124888EB0076D3FB /* icpfind */,
 				7332AEAE0D8D4986002BF5FF /* matchpoint */,
 				5796FA950C4395CC006B7C6E /* nona */,
+				733DF63F117F2268002EC787 /* pano_modify */,
+				733DF66E117F2384002EC787 /* pto_merge */,
+				E8A7D9BA10FB6F5A00839DF3 /* pto2mk */,
 				E8A7D9B710FB6F5A00839DF3 /* pano_trafo */,
 				734BDF5B0EB8EC19007EBA09 /* PTBatcher */,
-				E8A7D9BA10FB6F5A00839DF3 /* pto2mk */,
 				E8A7D9BE10FB6F5B00839DF3 /* tca_correct */,
 				E8A7D9C210FB6F5B00839DF3 /* vig_optimize */,
 			);
@@ -6554,8 +6718,6 @@
 				737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */,
 				737E498F11D3FD74002BA8AE /* Hugin.app */,
 				7357E524124777EB0098B385 /* makefilelib-Info.plist */,
-				7309D40B125B9893007D4719 /* cpfind */,
-				7396E4601269806E0096D1B3 /* checkpto */,
 			);
 			sourceTree = "<group>";
 		};
@@ -8515,8 +8677,10 @@
 			buildPhases = (
 				57D50A360F595A6300CCDCB5 /* Sources */,
 				57D50A380F595A6300CCDCB5 /* Frameworks */,
-				73DAADCE119DB90B002149AC /* Copy Excecutable files */,
 				57D50A570F595A6300CCDCB5 /* Copy Frameworks */,
+				738A877E126AE8AC00DC20B6 /* Copy Executable Files */,
+				73DAADCE119DB90B002149AC /* Copy External Excecutable files */,
+				738A879F126AEA8800DC20B6 /* Copy Resources Files */,
 				57D50A5B0F595A6300CCDCB5 /* Locale Script */,
 				57D50A5C0F595A6300CCDCB5 /* Copy ExifTool */,
 				57D50A720F595D0E00CCDCB5 /* Patch XRC */,
@@ -8527,8 +8691,10 @@
 			);
 			dependencies = (
 				57D50A300F595A6300CCDCB5 /* PBXTargetDependency */,
+				738A87F3126AEF0600DC20B6 /* PBXTargetDependency */,
 				57D50A320F595A6300CCDCB5 /* PBXTargetDependency */,
 				57D50A340F595A6300CCDCB5 /* PBXTargetDependency */,
+				738A8770126AE7ED00DC20B6 /* PBXTargetDependency */,
 			);
 			name = PTBatcherGUI;
 			productName = Nona;
@@ -8597,6 +8763,7 @@
 				57E3467B0C4A89B0006AA781 /* Sources */,
 				57E3467C0C4A89B0006AA781 /* Frameworks */,
 				576901E60D24D93300A6AD01 /* Copy Frameworks */,
+				7359F1F4126A17FF00D3291B /* Copy Executable Files */,
 				57E3467A0C4A89B0006AA781 /* Resources */,
 				571D8C740E2132DE006D0305 /* Patch and Copy XRC */,
 				57E347640C4A8F9F006AA781 /* Locale Script */,
@@ -8609,6 +8776,7 @@
 			dependencies = (
 				576901B80D24D61C00A6AD01 /* PBXTargetDependency */,
 				576ADD920F7FB09E003E8EE3 /* PBXTargetDependency */,
+				7359F20C126A186200D3291B /* PBXTargetDependency */,
 				5769F8980D23AB7F00A6AD01 /* PBXTargetDependency */,
 				73FC2B041100581400EAB009 /* PBXTargetDependency */,
 				73406639125BA9CB00FC4790 /* PBXTargetDependency */,
@@ -8861,14 +9029,15 @@
 			productReference = 737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */;
 			productType = "com.apple.product-type.application";
 		};
-		737E491B11D3FD74002BA8AE /* Hugin for use with extra tools */ = {
+		737E491B11D3FD74002BA8AE /* Hugin with extra tools */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 737E498B11D3FD74002BA8AE /* Build configuration list for PBXNativeTarget "Hugin for use with extra tools" */;
+			buildConfigurationList = 737E498B11D3FD74002BA8AE /* Build configuration list for PBXNativeTarget "Hugin with extra tools" */;
 			buildPhases = (
 				73406732125BBD6E00FC4790 /* Headers */,
 				737E492611D3FD74002BA8AE /* Sources */,
 				737E495E11D3FD74002BA8AE /* Frameworks */,
 				737E497A11D3FD74002BA8AE /* Copy Frameworks */,
+				7359F20A126A185E00D3291B /* Copy Executable Files */,
 				737E497F11D3FD74002BA8AE /* Resources */,
 				737E498611D3FD74002BA8AE /* Patch and Copy XRC */,
 				737E498711D3FD74002BA8AE /* Locale Script */,
@@ -8881,11 +9050,12 @@
 			dependencies = (
 				737E491C11D3FD74002BA8AE /* PBXTargetDependency */,
 				737E491E11D3FD74002BA8AE /* PBXTargetDependency */,
+				7359F21D126A188000D3291B /* PBXTargetDependency */,
 				737E499711D3FD9A002BA8AE /* PBXTargetDependency */,
 				737E492211D3FD74002BA8AE /* PBXTargetDependency */,
 				7340663F125BA9DB00FC4790 /* PBXTargetDependency */,
 			);
-			name = "Hugin for use with extra tools";
+			name = "Hugin with extra tools";
 			productName = Hugin;
 			productReference = 737E498F11D3FD74002BA8AE /* Hugin.app */;
 			productType = "com.apple.product-type.application";
@@ -9217,7 +9387,7 @@
 				5769F5FF0D23825700A6AD01 /* StitchProject */,
 				737E48AE11D3F8C6002BA8AE /* StitchProject with extra tools */,
 				57E3467D0C4A89B0006AA781 /* Hugin */,
-				737E491B11D3FD74002BA8AE /* Hugin for use with extra tools */,
+				737E491B11D3FD74002BA8AE /* Hugin with extra tools */,
 				57525A240C54BC4400BF8096 /* Nona */,
 				57D50A2F0F595A6300CCDCB5 /* PTBatcherGUI */,
 				57E347330C4A8EED006AA781 /* tools */,
@@ -9405,7 +9575,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n ../mac/complete-bundle.sh\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
 		};
 		571D8AC70E212172006D0305 /* Locale Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -9521,7 +9691,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";
 			showEnvVarsInLog = 0;
 		};
 		57D50A720F595D0E00CCDCB5 /* Patch XRC */ = {
@@ -9700,7 +9870,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi";
+			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-bundle.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries/*.dylib\nfi\n\n# fix new issue with libboost libraries where the softlink is not copied\ncd $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Libraries\nln -s libboost_date_time-1_44.dylib libboost_date_time.dylib\nln -s libboost_filesystem-1_44.dylib libboost_filesystem.dylib\nln -s libboost_iostreams-1_44.dylib libboost_iostreams.dylib\nln -s libboost_regex-1_44.dylib libboost_regex.dylib\nln -s libboost_thread-1_44.dylib libboost_thread.dylib\nln -s libboost_system-1_44.dylib libboost_system.dylib\n";

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/dda49e5b558f
changeset: 4500:dda49e5b558f
user:      James Legg <jlegg@...>
date:       Mon Oct 18 08:52:07 2010 +0100
description:
Stitcher tab: remove wxCollapsiblePanes because they didn't behave on Windows or OSX. Move file format selection to the related sections, and disable them when they can't affect the output. Split intermediate targets into related groups. Sit the stitch buttons in the lower right of the window. Use less jargon. Align the controls neatly.

diffstat:

 src/hugin1/hugin/PanoPanel.cpp      |  106 ++--
 src/hugin1/hugin/PanoPanel.h        |    7 +-
 src/hugin1/hugin/xrc/pano_panel.xrc |  747 ++++++++++++++++++-----------------
 3 files changed, 433 insertions(+), 427 deletions(-)

diffs (truncated from 1223 to 500 lines):

diff -r 0b8ff9a9fd49 -r dda49e5b558f src/hugin1/hugin/PanoPanel.cpp
--- a/src/hugin1/hugin/PanoPanel.cpp	Sat Oct 16 22:34:12 2010 +0100
+++ b/src/hugin1/hugin/PanoPanel.cpp	Mon Oct 18 08:52:07 2010 +0100
@@ -27,7 +27,6 @@
 
 #include <config.h>
 #include <wx/stdpaths.h>
-#include <wx/collpane.h>
 
 #include "panoinc_WX.h"
 #include "panoinc.h"
@@ -92,8 +91,6 @@
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_blended"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_stacks"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_layers"), PanoPanel::OnOutputFilesChanged)
-    EVT_COLLAPSIBLEPANE_CHANGED( XRCID("pano_cp_images_for_manual_editing"), PanoPanel::OnCollapsiblePaneChanged)
-    EVT_COLLAPSIBLEPANE_CHANGED( XRCID("pano_cp_processing"), PanoPanel::OnCollapsiblePaneChanged)
 
     EVT_CHOICE ( XRCID("pano_choice_remapper"),PanoPanel::RemapperChanged )
     EVT_BUTTON ( XRCID("pano_button_remapper_opts"),PanoPanel::OnRemapperOptions )
@@ -229,21 +226,19 @@
 
     m_FileFormatChoice = XRCCTRL(*this, "pano_choice_file_format", wxChoice);
     DEBUG_ASSERT(m_FileFormatChoice);
-    m_FileFormatPanelJPEG = XRCCTRL(*this, "pano_output_normal_opts_jpeg", wxPanel);
-    DEBUG_ASSERT(m_FileFormatPanelJPEG);
+    m_FileFormatOptionsLabel = XRCCTRL(*this, "pano_output_ldr_format_options_label", wxStaticText);
+    
     m_FileFormatJPEGQualityText = XRCCTRL(*this, "pano_output_normal_opts_jpeg_quality", wxTextCtrl);
     DEBUG_ASSERT(m_FileFormatJPEGQualityText);
     m_FileFormatJPEGQualityText->PushEventHandler(new TextKillFocusHandler(this));
 
-    m_FileFormatPanelTIFF = XRCCTRL(*this, "pano_output_normal_opts_tiff", wxPanel);
-    DEBUG_ASSERT(m_FileFormatPanelTIFF);
     m_FileFormatTIFFCompChoice = XRCCTRL(*this, "pano_output_normal_opts_tiff_compression", wxChoice);
     DEBUG_ASSERT(m_FileFormatTIFFCompChoice);
 
     m_HDRFileFormatChoice = XRCCTRL(*this, "pano_choice_hdr_file_format", wxChoice);
     DEBUG_ASSERT(m_HDRFileFormatChoice);
-    m_HDRFileFormatPanelTIFF = XRCCTRL(*this, "pano_output_hdr_opts_tiff", wxPanel);
-    DEBUG_ASSERT(m_HDRFileFormatPanelTIFF);
+    m_HDRFileFormatLabelTIFFCompression = XRCCTRL(*this, "pano_output_hdr_opts_tiff_compression_label", wxStaticText);
+    DEBUG_ASSERT(m_HDRFileFormatLabelTIFFCompression);
     m_FileFormatHDRTIFFCompChoice = XRCCTRL(*this, "pano_output_hdr_opts_tiff_compression", wxChoice);
     DEBUG_ASSERT(m_FileFormatHDRTIFFCompChoice);
 
@@ -296,9 +291,6 @@
 void PanoPanel::panoramaChanged (PT::Panorama &pano)
 {
     DEBUG_TRACE("");
-	bool hasImages = pano.getActiveImages().size() > 0;
-    m_StitchButton->Enable(hasImages);
-	m_BatchButton->Enable(hasImages);
 
 #ifdef STACK_CHECK //Disabled for 0.7.0 release
     const bool hasStacks = StackCheck(pano);
@@ -395,9 +387,6 @@
     m_ROITopTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().top() ));
     m_ROIBottomTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().bottom() ));
 
-    //do not stitch unless there are active images
-    m_StitchButton->Enable(hasImages);
-
     // output types
     XRCCTRL(*this, "pano_cb_ldr_output_blended",
             wxCheckBox)->SetValue(opt.outputLDRBlended);
@@ -428,13 +417,10 @@
                               opt.outputHDRStacks || 
                               opt.outputHDRLayers);
     
-    if (m_StitchButton->IsEnabled()) {
-        if(!anyOutputSelected)
-            m_StitchButton->Disable();
-    } else {
-        if(anyOutputSelected)
-            m_StitchButton->Enable();
-    }
+    //do not let the user stitch unless there are active images and an output selected.
+    bool any_output_possible = hasImages && anyOutputSelected;
+    m_StitchButton->Enable(any_output_possible);
+    m_BatchButton->Enable(any_output_possible);
 
 #ifdef STACK_CHECK //Disabled for 0.7.0 release
     if (hasStacks) {
@@ -483,50 +469,76 @@
     XRCCTRL(*this, "pano_text_hdrmerge", wxStaticText)->Enable(hdrMergeEnabled);
 
     // output file mode
+    bool ldr_pano_enabled = opt.outputLDRBlended ||
+                            opt.outputLDRExposureBlended ||
+                            opt.outputLDRExposureLayersFused;
+    
+    XRCCTRL(*this, "pano_output_ldr_format_label", wxStaticText)->Enable(ldr_pano_enabled);
+    m_FileFormatOptionsLabel->Enable(ldr_pano_enabled);
+    m_FileFormatChoice->Enable(ldr_pano_enabled);
+    m_FileFormatJPEGQualityText->Enable(ldr_pano_enabled);
+    m_FileFormatTIFFCompChoice->Enable(ldr_pano_enabled);
+    
     long i=0;
     if (opt.outputImageType == "tif") {
         i = 0;
-        m_FileFormatPanelJPEG->Hide();
-        m_FileFormatPanelTIFF->Show();
+        m_FileFormatOptionsLabel->Show();
+        m_FileFormatOptionsLabel->SetLabel(_("Compression:"));
+        m_FileFormatJPEGQualityText->Hide();
+        m_FileFormatTIFFCompChoice->Show();
         if (opt.outputImageTypeCompression  == "PACKBITS") {
             m_FileFormatTIFFCompChoice->SetSelection(1);
         } else if (opt.outputImageTypeCompression == "LZW") {
             m_FileFormatTIFFCompChoice->SetSelection(2);
-	} else if (opt.outputImageTypeCompression  == "DEFLATE") {
+        } else if (opt.outputImageTypeCompression  == "DEFLATE") {
             m_FileFormatTIFFCompChoice->SetSelection(3);
         } else {
             m_FileFormatTIFFCompChoice->SetSelection(0);
         }
     } else if (opt.outputImageType == "jpg") {
         i = 1;
-        m_FileFormatPanelJPEG->Show();
-        m_FileFormatPanelTIFF->Hide();
+        m_FileFormatOptionsLabel->Show();
+        m_FileFormatOptionsLabel->SetLabel(_("Quality:"));
+        m_FileFormatJPEGQualityText->Show();
+        m_FileFormatTIFFCompChoice->Hide();
         m_FileFormatJPEGQualityText->SetValue(wxString::Format(wxT("%d"), opt.quality));
     } else if (opt.outputImageType == "png") {
-        m_FileFormatPanelJPEG->Hide();
-        m_FileFormatPanelTIFF->Hide();
+        m_FileFormatOptionsLabel->Hide();
+        m_FileFormatJPEGQualityText->Hide();
+        m_FileFormatTIFFCompChoice->Hide();
         i = 2;
     } else if (opt.outputImageType == "exr") {
-        m_FileFormatPanelJPEG->Hide();
-        m_FileFormatPanelTIFF->Hide();
+        /// @todo Is this right? I don't see a 4th item in the combo box, and exr is a confusing LDR format.
+        m_FileFormatOptionsLabel->Hide();
+        m_FileFormatJPEGQualityText->Hide();
+        m_FileFormatTIFFCompChoice->Hide();
         i = 3;
     } else
         wxLogError(wxT("INTERNAL error: unknown output image type"));
 
     m_FileFormatChoice->SetSelection(i);
 
+    bool hdr_pano_enabled = opt.outputHDRBlended;
+    
+    XRCCTRL(*this, "pano_output_hdr_format_label", wxStaticText)->Enable(hdr_pano_enabled);
+    m_HDRFileFormatChoice->Enable(hdr_pano_enabled);
+    m_HDRFileFormatLabelTIFFCompression->Enable(hdr_pano_enabled);
+    m_FileFormatHDRTIFFCompChoice->Enable(hdr_pano_enabled);
+    
     i=0;
     if (opt.outputImageTypeHDR == "exr") {
         i = 0;
-        m_HDRFileFormatPanelTIFF->Hide();
+        m_HDRFileFormatLabelTIFFCompression->Hide();
+        m_FileFormatHDRTIFFCompChoice->Hide();
     } else if (opt.outputImageTypeHDR == "tif") {
         i = 1;
-        m_HDRFileFormatPanelTIFF->Show();
+        m_HDRFileFormatLabelTIFFCompression->Show();
+        m_FileFormatHDRTIFFCompChoice->Show();
         if (opt.outputImageTypeHDRCompression  == "PACKBITS") {
             m_FileFormatHDRTIFFCompChoice->SetSelection(1);
         } else if (opt.outputImageTypeHDRCompression == "LZW") {
             m_FileFormatHDRTIFFCompChoice->SetSelection(2);
-	} else if (opt.outputImageTypeHDRCompression  == "DEFLATE") {
+        } else if (opt.outputImageTypeHDRCompression  == "DEFLATE") {
             m_FileFormatHDRTIFFCompChoice->SetSelection(3);
         } else {
             m_FileFormatHDRTIFFCompChoice->SetSelection(0);
@@ -1140,31 +1152,20 @@
     PanoramaOptions opt = pano->getOptions();
     switch (fmt) {
         case 1:
-            m_FileFormatPanelJPEG->Show();
-            m_FileFormatPanelTIFF->Hide();
             opt.outputImageType ="jpg";
             break;
         case 2:
-            m_FileFormatPanelJPEG->Hide();
-            m_FileFormatPanelTIFF->Hide();
             opt.outputImageType ="png";
             break;
         case 3:
-            m_FileFormatPanelJPEG->Hide();
-            m_FileFormatPanelTIFF->Hide();
             opt.outputImageType ="exr";
             break;
         default:
         case 0:
-            m_FileFormatPanelJPEG->Hide();
-            m_FileFormatPanelTIFF->Show();
             opt.outputImageType ="tif";
             break;
     }
 
-    m_pano_ctrls->FitInside();
-    Layout();
-
     GlobalCmdHist::getInstance().addCommand(
             new PT::SetPanoOptionsCmd( *pano, opt )
             );
@@ -1179,19 +1180,14 @@
     PanoramaOptions opt = pano->getOptions();
     switch (fmt) {
         case 1:
-            m_HDRFileFormatPanelTIFF->Show();
             opt.outputImageTypeHDR ="tif";
             break;
         default:
         case 0:
-            m_HDRFileFormatPanelTIFF->Hide();
             opt.outputImageTypeHDR ="exr";
             break;
     }
 
-    m_pano_ctrls->FitInside();
-    Layout();
-
     GlobalCmdHist::getInstance().addCommand(
             new PT::SetPanoOptionsCmd( *pano, opt )
             );
@@ -1291,16 +1287,6 @@
         );
 }
 
-void PanoPanel::OnCollapsiblePaneChanged(wxCollapsiblePaneEvent& event)
-{
-    // The amount of space of space a collapsible pane takes has just changed:
-    // recalculate the widget positions.
-    Layout();
-#ifdef __WXMSW__
-    this->Refresh(false);
-#endif
-}
-
 bool PanoPanel::CheckGoodSize()
 {
     vigra::Rect2D cropped_region = pano->getOptions().getROI();
diff -r 0b8ff9a9fd49 -r dda49e5b558f src/hugin1/hugin/PanoPanel.h
--- a/src/hugin1/hugin/PanoPanel.h	Sat Oct 16 22:34:12 2010 +0100
+++ b/src/hugin1/hugin/PanoPanel.h	Mon Oct 18 08:52:07 2010 +0100
@@ -34,7 +34,6 @@
 class wxTextCtrl;
 class wxChoice;
 class wxComboBox;
-class wxCollapsiblePaneEvent;
 
 class StitcherPanel;
 
@@ -111,7 +110,6 @@
     void ProjectionChanged(wxCommandEvent & e);
 
     void OnOutputFilesChanged(wxCommandEvent & e);
-    void OnCollapsiblePaneChanged(wxCollapsiblePaneEvent& event);
     void RemapperChanged(wxCommandEvent & e);
     void OnRemapperOptions(wxCommandEvent & e);
 
@@ -202,13 +200,12 @@
     wxButton    * m_CalcOptROIButton;
 
     wxChoice    * m_FileFormatChoice;
-    wxPanel     * m_FileFormatPanelJPEG;
+    wxStaticText* m_FileFormatOptionsLabel;
     wxTextCtrl  * m_FileFormatJPEGQualityText;
-    wxPanel     * m_FileFormatPanelTIFF;
     wxChoice    * m_FileFormatTIFFCompChoice;
 
     wxChoice    * m_HDRFileFormatChoice;
-    wxPanel     * m_HDRFileFormatPanelTIFF;
+    wxStaticText* m_HDRFileFormatLabelTIFFCompression;
     wxChoice    * m_FileFormatHDRTIFFCompChoice;
 
     wxScrolledWindow *m_pano_ctrls;
diff -r 0b8ff9a9fd49 -r dda49e5b558f src/hugin1/hugin/xrc/pano_panel.xrc
--- a/src/hugin1/hugin/xrc/pano_panel.xrc	Sat Oct 16 22:34:12 2010 +0100
+++ b/src/hugin1/hugin/xrc/pano_panel.xrc	Mon Oct 18 08:52:07 2010 +0100
@@ -166,7 +166,7 @@
                          and send to batch buttons. -->
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Projection</label>
+                        <label>Projection:</label>
                         <font>
                           <style platform="mac">normal</style>
                           <family platform="mac">swiss</family>
@@ -174,7 +174,7 @@
                           <size platform="mac">12</size>
                         </font>
                       </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>0,0</cellpos>
                     </object>
                     <object class="sizeritem">
@@ -188,7 +188,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Field of View</label>
+                        <label>Field of View:</label>
                         <font>
                           <style platform="mac">normal</style>
                           <family platform="mac">swiss</family>
@@ -196,14 +196,14 @@
                           <size platform="mac">12</size>
                         </font>
                       </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>1,0</cellpos>
                     </object>
                     <object class="sizeritem">
                       <cellpos>1,1</cellpos>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
                       <object class="wxStaticText">
-                        <label>Horizontal</label>
+                        <label>Horizontal:</label>
                       </object>
                     </object>
                     <object class="sizeritem">
@@ -217,7 +217,7 @@
                       <cellpos>1,3</cellpos>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
                       <object class="wxStaticText">
-                        <label>Vertical</label>
+                        <label>Vertical:</label>
                       </object>
                     </object>
                     <object class="sizeritem">
@@ -231,14 +231,18 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="pano_button_calc_fov">
-                        <label>Calculate Field of View</label>
+                        <!-- Gnome wants command buttons in header case, Microsoft and Apple want sentence case.
+                             I don't know about OS/2, but any label is better than none.-->
+                        <label platform="win|mac|os2">Calculate field of view</label>
+                        <label platform="unix">Calculate Field of View</label>
                       </object>
-                      <flag>wxEXPAND</flag>
+                      <!-- If there was an option, I would would expand the buttons horizontally only. -->
+                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>1,5</cellpos>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Canvas Size</label>
+                        <label>Canvas Size:</label>
                         <font>
                           <style platform="mac">normal</style>
                           <family platform="mac">swiss</family>
@@ -246,12 +250,12 @@
                           <size platform="mac">12</size>
                         </font>
                       </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>2,0</cellpos>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Width</label>
+                        <label>Width:</label>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>2,1</cellpos>
@@ -266,7 +270,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Height</label>
+                        <label>Height:</label>
                         <style>wxALIGN_RIGHT</style>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -284,16 +288,17 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="pano_button_opt_width">
-                        <label>Calculate Optimal Size</label>
+                        <label platform="unix">Calculate Optimal Size</label>
+                        <label platform="win|mac|os2">Calculate optimal size</label>
                         <tooltip>Calculate optimal image size, such that the resolution in the image center stays similar</tooltip>
                       </object>
-                      <flag>wxEXPAND</flag>
+                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>2,5</cellpos>
                     </object>
                     <!-- Crop entries are split onto two rows -->
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Crop</label>
+                        <label>Crop:</label>
                         <font>
                           <style platform="mac">normal</style>
                           <family platform="mac">swiss</family>
@@ -301,13 +306,12 @@
                           <size platform="mac">12</size>
                         </font>
                       </object>
-                      <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>3,0</cellpos>
-                      <cellspan>2,1</cellspan>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Left</label>
+                        <label>Left:</label>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
                       <cellpos>3,1</cellpos>
@@ -324,7 +328,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Top</label>
+                        <label>Top:</label>
                         <style>wxALIGN_RIGHT</style>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -342,7 +346,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Right</label>
+                        <label>Right:</label>
                         <style>wxALIGN_RIGHT</style>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -359,7 +363,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Bottom</label>
+                        <label>Bottom:</label>
                         <style>wxALIGN_RIGHT</style>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -376,25 +380,20 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="pano_button_opt_roi">
-                        <label>Autocrop</label>
+                        <label platform="unix">Fit Crop to Images</label>
+                        <label platform="os2|mac|win">Fit crop to images</label>
                         <tooltip>Calculate crop borders such that the final image has the largest area without excess</tooltip>
                       </object>
                       <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxEXPAND</flag>
                       <cellpos>3,5</cellpos>
                       <cellspan>2,1</cellspan>
                     </object>
-                    <vgap>6</vgap>
-                    <hgap>12</hgap>
-                  </object>
-                  <flag>wxLEFT|wxEXPAND</flag>
-                  <border>6</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxBoxSizer">
-                    <orient>wxVERTICAL</orient>
+                    
+                    <!--Panorama output section -->
+                    
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Panorama Outputs</label>
+                        <label>Panorama Outputs:</label>
                         <font>
                           <style platform="mac">normal</style>
                           <family platform="mac">swiss</family>
@@ -402,249 +401,49 @@
                           <size platform="mac">12</size>
                         </font>
                       </object>
-                      <flag>wxTOP|wxALIGN_BOTTOM|wxEXPAND</flag>
-                      <border>6</border>
+                      <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag>
+                      <border>12</border>
+                      <cellpos>5,0</cellpos>
+                      <cellspan>1,1</cellspan>
                     </object>
                     <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <orient>wxVERTICAL</orient>
-                        <object class="sizeritem">
-                          <object class="wxCheckBox" name="pano_cb_ldr_output_blended">
-                            <label>Exposure corrected, low dynamic range panorama</label>
-                            <tooltip>Blend all images into a seamless panorama, using exposure set in the Exposure tab</tooltip>
-                          </object>
-                          <flag platform="unix|mac">wxEXPAND|wxTOP|wxBOTTOM</flag>
-                          <!-- don't use expand on wxCheckbox on Windows, this makes also the big empty space right the checkbox to react to mouse clicks -->
-                          <flag platform="win">wxTOP|wxBOTTOM</flag>
-                          <border>2</border>
-                        </object>
-                        <object class="sizeritem">