Hugin

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e432bab64741
changeset: 4446:e432bab64741
user:      tmodes
date:       Wed Oct 06 22:20:01 2010 +0200
description:
Merged

diffstat:

 src/hugin1/icpfind/AutoCtrlPointCreator.cpp   |   16 +-
 src/hugin_cpfind/cpfind/PanoDetector.cpp      |  347 +++++++++++++++++++++++--
 src/hugin_cpfind/cpfind/PanoDetector.h        |    5 +
 src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp |    3 +-
 src/hugin_cpfind/cpfind/main.cpp              |    4 +
 5 files changed, 334 insertions(+), 41 deletions(-)

diffs (truncated from 514 to 500 lines):

diff -r 2c6640d3923e -r e432bab64741 src/hugin1/icpfind/AutoCtrlPointCreator.cpp
--- a/src/hugin1/icpfind/AutoCtrlPointCreator.cpp	Wed Oct 06 22:14:39 2010 +0200
+++ b/src/hugin1/icpfind/AutoCtrlPointCreator.cpp	Wed Oct 06 22:20:01 2010 +0200
@@ -813,8 +813,12 @@
     for(unsigned int i=0;i<stack_images.size();i++)
     {
         std::sort(stack_images[i].images.begin(),stack_images[i].images.end(),sort_img_ev);
-        unsigned int median=stack_images[i].images.size() / 2;
-        images_layer.insert(stack_images[i].images[median].img_nr);
+        unsigned int index=0;
+        if(stack_images[i].images[0].ev!=stack_images[i].images[stack_images[i].images.size()-1].ev)
+        {
+            index=stack_images[i].images.size() / 2;
+        };
+        images_layer.insert(stack_images[i].images[index].img_nr);
     };
     //generate cp for median exposure
     ret_value=0;
@@ -1032,8 +1036,12 @@
     for(unsigned int i=0;i<stack_images.size();i++)
     {
         std::sort(stack_images[i].images.begin(),stack_images[i].images.end(),sort_img_ev);
-        unsigned int median=stack_images[i].images.size() / 2;
-        images_layer.insert(stack_images[i].images[median].img_nr);
+        unsigned int index=0;
+        if(stack_images[i].images[0].ev!=stack_images[i].images[stack_images[i].images.size()-1].ev)
+        {
+            index=stack_images[i].images.size() / 2;
+        };
+        images_layer.insert(stack_images[i].images[index].img_nr);
     };
     ret_value=0;
     //work on all stacks
diff -r 2c6640d3923e -r e432bab64741 src/hugin_cpfind/cpfind/PanoDetector.cpp
--- a/src/hugin_cpfind/cpfind/PanoDetector.cpp	Wed Oct 06 22:14:39 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetector.cpp	Wed Oct 06 22:20:01 2010 +0200
@@ -15,6 +15,13 @@
 #include <nona/RemappedPanoImage.h>
 #include <nona/ImageRemapper.h>
 
+//for multi row strategy
+#include <panodata/StandardImageVariableGroups.h>
+#include <PT/Panorama.h>
+#include <PT/ImageGraph.h>
+#include <algorithms/optimizer/PTOptimizer.h>
+#include <algorithms/basic/CalculateOverlap.h>
+
 #include "ImageImport.h"
 
 #ifdef _WINDOWS
@@ -71,7 +78,7 @@
 	_kdTreeSearchSteps(40), _kdTreeSecondDistance(0.15), _sieve2Width(5), _sieve2Height(5),
 	_sieve2Size(2), _test(false), _cores(utils::getCPUCount()), _ransacIters(1000), _ransacDistanceThres(25),
     _minimumMatches(4), _linearMatch(false), _linearMatchLen(1), _downscale(true), _cache(false), _cleanup(false),
-    _keypath(""), _celeste(false), _celesteThreshold(0.5), _celesteRadius(20)
+    _keypath(""), _celeste(false), _celesteThreshold(0.5), _celesteRadius(20), _multirow(false)
 {
 	_panoramaInfo = new Panorama();
 }
@@ -86,6 +93,12 @@
 		return false;
 	}
 
+    if(_linearMatch && _multirow)
+    {
+        std::cout << "Linear match and multi row matching strategy does not work together." << std::endl;
+        return false;
+    };
+
     // check the test mode
 	if (_test)
 	{
@@ -133,11 +146,21 @@
 	cout << "  Search steps : " << _kdTreeSearchSteps << endl;
 	cout << "  Second match distance : " << _kdTreeSecondDistance << endl;
 	cout << "Matching Options" << endl;
-	cout << "  Mode : " << (_linearMatch?"Linear match":"All pairs"); 
-	if (_linearMatch)
-		cout << " with length of " << _linearMatchLen << " image" << endl;
-	else
-		cout << endl;
+    if(_linearMatch)
+    {
+        cout << "  Mode : Linear match with length of " << _linearMatch << " image" << endl;
+    }
+    else
+    {
+        if(_multirow)
+        {
+            cout << "  Mode : Multi row" << endl;
+        }
+        else
+        {
+            cout << "  Mode : All pairs" << endl;
+        };
+    };
 	cout << "  Distance threshold : " << _ransacDistanceThres << endl;
 	cout << "RANSAC Options" << endl;
 	cout << "  Iterations : " << _ransacIters << endl;
@@ -371,15 +394,24 @@
 	catch(Synchronization_Exception& e)
 	{ 
 		TRACE_ERROR(e.what() << endl);
+        if(svmModel!=NULL)
+        {
+            celeste::destroySVMmodel(svmModel);
+        };
 		return;
 	}
 
+    if(svmModel!=NULL)
+    {
+        celeste::destroySVMmodel(svmModel);
+    };
+
     // check if the load of images succeed.
-   if (!checkLoadSuccess())
-   {
+    if (!checkLoadSuccess())
+    {
        TRACE_INFO("One or more images failed to load. Exiting.");
        return;
-   }
+    }
   
     if(_cache)
     {
@@ -396,29 +428,21 @@
 
     // Detect matches if writeKeyPoints wasn't set  
     if(_keyPointsIdx.size() == 0)
-	{
-		// 3. prepare matches
-		prepareMatches();
-
-		// 4. find matches
-		TRACE_INFO(endl<< "--- Find matches ---" << endl);
-		try 
-		{
-			BOOST_FOREACH(MatchData& aMD, _matchesData)
-				aExecutor.execute(new MatchDataRunnable(aMD, *this));
-			aExecutor.wait();
-		} 
-		catch(Synchronization_Exception& e)
-		{ 
-			TRACE_ERROR(e.what() << endl);
-			return;
-		}
-
-		// Add detected matches to _panoramaInfo
-		BOOST_FOREACH(MatchData& aM, _matchesData)
-			BOOST_FOREACH(lfeat::PointMatchPtr& aPM, aM._matches)
-				_panoramaInfo->addCtrlPoint(ControlPoint(aM._i1->_number, aPM->_img1_x, aPM->_img1_y,
-										 							  aM._i2->_number, aPM->_img2_x, aPM->_img2_y));
+    {
+        if(_multirow)
+        {
+            if(!matchMultiRow(aExecutor))
+            {
+                return;
+            };
+        }
+        else
+        {
+            if(!match(aExecutor))
+            {
+                return;
+            };
+        };
 	}
 	
 	// 5. write output
@@ -438,11 +462,33 @@
         writeOutput();
         TRACE_INFO("Written output to " << _outputFile << endl << endl);
     };
-    if(svmModel!=NULL)
+}
+
+bool PanoDetector::match(PoolExecutor& aExecutor)
+{
+    // 3. prepare matches
+    prepareMatches();
+    // 4. find matches
+    TRACE_INFO(endl<< "--- Find matches ---" << endl);
+    try 
     {
-        celeste::destroySVMmodel(svmModel);
-    };
-}
+        BOOST_FOREACH(MatchData& aMD, _matchesData)
+            aExecutor.execute(new MatchDataRunnable(aMD, *this));
+        aExecutor.wait();
+    } 
+    catch(Synchronization_Exception& e)
+    { 
+        TRACE_ERROR(e.what() << endl);
+        return false;
+    }
+
+    // Add detected matches to _panoramaInfo
+    BOOST_FOREACH(MatchData& aM, _matchesData)
+        BOOST_FOREACH(lfeat::PointMatchPtr& aPM, aM._matches)
+            _panoramaInfo->addCtrlPoint(ControlPoint(aM._i1->_number, aPM->_img1_x, aPM->_img1_y,
+                                                     aM._i2->_number, aPM->_img2_x, aPM->_img2_y));
+    return true;
+};
 
 bool PanoDetector::loadProject()
 {
@@ -621,3 +667,232 @@
 	}
 }
 
+struct img_ev
+{
+    unsigned int img_nr;
+    double ev;
+};
+struct stack_img
+{
+    unsigned int layer_nr;
+    std::vector<img_ev> images;
+};
+bool sort_img_ev (img_ev i1, img_ev i2) { return (i1.ev<i2.ev); };
+
+bool PanoDetector::matchMultiRow(PoolExecutor& aExecutor)
+{
+    //step 1
+    std::vector<stack_img> stack_images;
+    HuginBase::StandardImageVariableGroups* variable_groups = new HuginBase::StandardImageVariableGroups(*_panoramaInfo);
+    UIntSet imgs;
+    fill_set(imgs,0,_panoramaInfo->getNrOfImages()-1);
+    for(UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); it++)
+    {
+        unsigned int stack_nr=variable_groups->getStacks().getPartNumber(*it);
+        //check, if this stack is already in list
+        bool found=false;
+        unsigned int index=0;
+        for(index=0;index<stack_images.size();index++)
+        {
+            found=(stack_images[index].layer_nr==stack_nr);
+            if(found)
+            {
+                break;
+            };
+        };
+        if(!found)
+        {
+            //new stack
+            stack_images.resize(stack_images.size()+1);
+            index=stack_images.size()-1;
+            //add new stack
+            stack_images[index].layer_nr=stack_nr;
+        };
+        //add new image
+        unsigned int new_image_index=stack_images[index].images.size();
+        stack_images[index].images.resize(new_image_index+1);
+        stack_images[index].images[new_image_index].img_nr=*it;
+        stack_images[index].images[new_image_index].ev=_panoramaInfo->getImage(*it).getExposure();
+    };
+    delete variable_groups;
+    //get image with median exposure for search with cp generator
+    vector<unsigned int> images_layer;
+    UIntSet images_layer_set;
+    for(unsigned int i=0;i<stack_images.size();i++)
+    {
+        std::sort(stack_images[i].images.begin(),stack_images[i].images.end(),sort_img_ev);
+        unsigned int index=0;
+        if(stack_images[i].images[0].ev!=stack_images[i].images[stack_images[i].images.size()-1].ev)
+        {
+            index=stack_images[i].images.size() / 2;
+        };
+        images_layer.push_back(stack_images[i].images[index].img_nr);
+        images_layer_set.insert(stack_images[i].images[index].img_nr);
+        if(stack_images[i].images.size()>1)
+        {
+            //build match list for stacks
+            for(unsigned int j=0;j<stack_images[i].images.size()-1;j++)
+            {
+                _matchesData.push_back(MatchData());
+                MatchData& aM=_matchesData.back();
+                aM._i1=&(_filesData[stack_images[i].images[j].img_nr]);
+                aM._i2=&(_filesData[stack_images[i].images[j+1].img_nr]);
+            };
+        };
+    };
+    //build match data list for image pairs
+    if(images_layer.size()>1)
+    {
+        for(unsigned int i=0;i<images_layer.size()-1;i++)
+        {
+            _matchesData.push_back(MatchData());
+            MatchData& aM = _matchesData.back();
+            aM._i1 = &(_filesData[images_layer[i]]);
+            aM._i2 = &(_filesData[images_layer[i+1]]);
+        };
+    };
+    TRACE_INFO(endl<< "--- Find matches ---" << endl);
+    try 
+    {
+        BOOST_FOREACH(MatchData& aMD, _matchesData)
+            aExecutor.execute(new MatchDataRunnable(aMD, *this));
+        aExecutor.wait();
+    }
+    catch(Synchronization_Exception& e)
+    {
+        TRACE_ERROR(e.what() << endl);
+        return false;
+    }
+
+    // Add detected matches to _panoramaInfo
+    BOOST_FOREACH(MatchData& aM, _matchesData)
+        BOOST_FOREACH(lfeat::PointMatchPtr& aPM, aM._matches)
+            _panoramaInfo->addCtrlPoint(ControlPoint(aM._i1->_number, aPM->_img1_x, aPM->_img1_y,
+                                                     aM._i2->_number, aPM->_img2_x, aPM->_img2_y));
+    
+    // step 2: connect all image groups
+    _matchesData.clear();
+    CPGraph graph;
+    createCPGraph(*_panoramaInfo, graph);
+    CPComponents comps;
+    int n = findCPComponents(graph, comps);
+    if(n>1)
+    {
+        vector<unsigned int> ImagesGroups;
+        for(unsigned int i=0;i<n;i++)
+        {
+            ImagesGroups.push_back(*(comps[i].begin()));
+            if(comps[i].size()>1)
+                ImagesGroups.push_back(*(comps[i].rbegin()));
+        };
+        for(unsigned int i=0;i<ImagesGroups.size()-1;i++)
+        {
+            for(unsigned int j=i+1;j<ImagesGroups.size();j++)
+            {
+                _matchesData.push_back(MatchData());
+                MatchData& aM = _matchesData.back();
+                aM._i1 = &(_filesData[ImagesGroups[i]]);
+                aM._i2 = &(_filesData[ImagesGroups[j]]);
+            };
+        };
+        TRACE_INFO(endl<< "--- Find matches in images groups ---" << endl);
+        try 
+        {
+            BOOST_FOREACH(MatchData& aMD, _matchesData)
+                aExecutor.execute(new MatchDataRunnable(aMD, *this));
+            aExecutor.wait();
+        } 
+        catch(Synchronization_Exception& e)
+        { 
+            TRACE_ERROR(e.what() << endl);
+            return false;
+        }
+        BOOST_FOREACH(MatchData& aM, _matchesData)
+            BOOST_FOREACH(lfeat::PointMatchPtr& aPM, aM._matches)
+                _panoramaInfo->addCtrlPoint(ControlPoint(aM._i1->_number, aPM->_img1_x, aPM->_img1_y,
+                                                         aM._i2->_number, aPM->_img2_x, aPM->_img2_y));
+    };
+    // step 3: now connect all overlapping images
+    _matchesData.clear();
+    createCPGraph(*_panoramaInfo,graph);
+    if(findCPComponents(graph, comps)==1 && images_layer.size()>2)
+    {
+        PT::Panorama optPano=_panoramaInfo->getSubset(images_layer_set);
+        //next steps happens only when all images are connected;
+        //now optimize panorama
+        PanoramaOptions opts = _panoramaInfo->getOptions();
+        opts.setProjection(PanoramaOptions::EQUIRECTANGULAR);
+        opts.optimizeReferenceImage=0;
+        // calculate proper scaling, 1:1 resolution.
+        // Otherwise optimizer distances are meaningless.
+        opts.setWidth(30000, false);
+        opts.setHeight(15000);
+
+        optPano.setOptions(opts);
+        int w = optPano.calcOptimalWidth();
+        opts.setWidth(w);
+        opts.setHeight(w/2);
+        optPano.setOptions(opts);
+
+        //generate optimize vector, optimize only yaw and pitch
+        OptimizeVector optvars;
+        const SrcPanoImage & anchorImage = optPano.getImage(opts.optimizeReferenceImage);
+        for (unsigned i=0; i < optPano.getNrOfImages(); i++) 
+        {
+            std::set<std::string> imgopt;
+            if(i==opts.optimizeReferenceImage)
+            {
+                //optimize only anchors pitch, not yaw
+                imgopt.insert("p");
+            }
+            else
+            {
+                // do not optimize anchor image's stack for position.
+                if(!optPano.getImage(i).YawisLinkedWith(anchorImage))
+                {
+                    imgopt.insert("p");
+                    imgopt.insert("y");
+                };
+            };
+            optvars.push_back(imgopt);
+        }
+        optPano.setOptimizeVector(optvars);
+        HuginBase::PTools::optimize(optPano);
+
+        HuginBase::CalculateImageOverlap overlap(&optPano);
+        overlap.calculate(10);
+        for(unsigned int i=0;i<images_layer.size()-2;i++)
+        {
+            for(unsigned int j=i+2;j<images_layer.size();j++)
+            {
+                if(overlap.getOverlap(i,j)>0)
+                {
+                    _matchesData.push_back(MatchData());
+                    MatchData& aM = _matchesData.back();
+                    aM._i1 = &(_filesData[images_layer[i]]);
+                    aM._i2 = &(_filesData[images_layer[j]]);
+                };
+            };
+        };
+        TRACE_INFO(endl<< "--- Find matches for overlapping images ---" << endl);
+        try 
+        {
+            BOOST_FOREACH(MatchData& aMD, _matchesData)
+                aExecutor.execute(new MatchDataRunnable(aMD, *this));
+            aExecutor.wait();
+        }
+        catch(Synchronization_Exception& e)
+        {
+            TRACE_ERROR(e.what() << endl);
+            return false;
+        }
+
+        // Add detected matches to _panoramaInfo
+        BOOST_FOREACH(MatchData& aM, _matchesData)
+            BOOST_FOREACH(lfeat::PointMatchPtr& aPM, aM._matches)
+                _panoramaInfo->addCtrlPoint(ControlPoint(aM._i1->_number, aPM->_img1_x, aPM->_img1_y,
+                                                         aM._i2->_number, aPM->_img2_x, aPM->_img2_y));
+    };
+    return true;
+};
+
diff -r 2c6640d3923e -r e432bab64741 src/hugin_cpfind/cpfind/PanoDetector.h
--- a/src/hugin_cpfind/cpfind/PanoDetector.h	Wed Oct 06 22:14:39 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetector.h	Wed Oct 06 22:20:01 2010 +0200
@@ -60,6 +60,8 @@
     void printFilenames();
 	void		printHelp();
 	void		run();
+    bool match(ZThread::PoolExecutor& aExecutor);
+    bool matchMultiRow(ZThread::PoolExecutor& aExecutor);
 	
 	
 	// accessors
@@ -104,6 +106,8 @@
 	inline void setLinearMatchLen(int iLen) { _linearMatchLen = iLen; }
 	inline bool getLinearMatch() const { return _linearMatch; }
 	inline int  getLinearMatchLen() const { return _linearMatchLen; }
+    inline void setMultiRow(bool iMultirow) { _multirow = iMultirow; }
+    inline bool getMultiRow() const { return _multirow; }
 
 	inline bool	getDownscale() const { return _downscale; }
     inline void setDownscale(bool iDown) { _downscale = iDown; }
@@ -155,6 +159,7 @@
 
 	bool						_linearMatch;
 	int						_linearMatchLen;
+    bool        _multirow;
 
 	bool						_test;
 	int						_cores;
diff -r 2c6640d3923e -r e432bab64741 src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
--- a/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp	Wed Oct 06 22:14:39 2010 +0200
+++ b/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp	Wed Oct 06 22:20:01 2010 +0200
@@ -661,8 +661,9 @@
 		return;
 	}
 
-	aOut << "# pto project file generated by panomatic" << endl << endl;
+    aOut << "# pto project file generated by Hugins cpfind" << endl << endl;
 
+    _panoramaInfo->removeDuplicateCtrlPoints();
 	AppBase::DocumentData::ReadWriteError err = _panoramaInfo->writeData(aOut);
 	if (err != AppBase::DocumentData::SUCCESSFUL) {
 		  cerr << "ERROR couldn't write to output file '" << _outputFile << "'!" << endl;
diff -r 2c6640d3923e -r e432bab64741 src/hugin_cpfind/cpfind/main.cpp
--- a/src/hugin_cpfind/cpfind/main.cpp	Wed Oct 06 22:14:39 2010 +0200
+++ b/src/hugin_cpfind/cpfind/main.cpp	Wed Oct 06 22:20:01 2010 +0200
@@ -97,6 +97,7 @@
 		ValueArg<int> aArgSieve1Size("","sieve1size",	"Sieve 1 : Max points per bucket    (default : 30)\n", false, 30, "int");
 		SwitchArg aArgLinearMatch("","linearmatch", "Enable linear images matching (default : all pairs)", false);
 		ValueArg<int> aArgLinearMatchLen("","linearmatchlen", "Number of images to match in linear matching (default:1)\n", false, 1 ,"int");
+        SwitchArg aArgMultiRow("","multirow", "Enable heuristic multi row matching (default: off)",false);
 		
 		ValueArg<int> aArgKDTreeSearchSteps("","kdtreesteps",   "KDTree : search steps    (default : 40)", false, 40, "int");
 		ValueArg<double> aArgKDTreeSecondDist("","kdtreeseconddist", "KDTree : distance of 2nd match    (default : 0.15)\n", false, 0.15, "double");
@@ -116,6 +117,7 @@
 		cmd.add(aArgMinMatches);
 		cmd.add(aArgLinearMatchLen);

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/847139136070
changeset: 4464:847139136070
user:      tmodes
date:       Wed Oct 13 21:57:13 2010 +0200
description:
Merged

diffstat:

 src/hugin1/hugin/MainFrame.cpp |   5 +++
 src/hugin1/hugin/MainFrame.h   |   1 +
 src/hugin1/hugin/PanoPanel.cpp |  69 ++++++++++++++++++++++++++++++++++++++++++
 src/hugin1/hugin/PanoPanel.h   |  12 +++++++
 4 files changed, 87 insertions(+), 0 deletions(-)

diffs (141 lines):

diff -r 61d3ec192625 -r 847139136070 src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Wed Oct 13 21:56:09 2010 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Wed Oct 13 21:57:13 2010 +0200
@@ -1592,6 +1592,11 @@
     cpe->setRightImage(img2);
 }
 
+void MainFrame::ShowStitcherTab()
+{
+    ///@todo Stop using magic numbers for the tabs.
+    m_notebook->SetSelection(8);
+}
 
 /** update the display */
 void MainFrame::updateProgressDisplay()
diff -r 61d3ec192625 -r 847139136070 src/hugin1/hugin/MainFrame.h
--- a/src/hugin1/hugin/MainFrame.h	Wed Oct 13 21:56:09 2010 +0200
+++ b/src/hugin1/hugin/MainFrame.h	Wed Oct 13 21:57:13 2010 +0200
@@ -150,6 +150,7 @@
 
 
     void ShowCtrlPointEditor(unsigned int img1, unsigned int img2);
+    void ShowStitcherTab();
 
     void resetProgress(double max);
     bool increaseProgress(double delta);
diff -r 61d3ec192625 -r 847139136070 src/hugin1/hugin/PanoPanel.cpp
--- a/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 13 21:56:09 2010 +0200
+++ b/src/hugin1/hugin/PanoPanel.cpp	Wed Oct 13 21:57:13 2010 +0200
@@ -962,6 +962,11 @@
     if (pano->getNrOfImages() == 0) {
         return;
     }
+    
+    if (!CheckGoodSize()) {
+        // oversized pano and the user no longer wants to stitch.
+        return;
+    }
 
     // save project
     // copy pto file to temporary file
@@ -1088,6 +1093,9 @@
 
 void PanoPanel::OnSendToBatch ( wxCommandEvent & e )
 {
+    if (!CheckGoodSize()) {
+        return;
+    }
 	wxCommandEvent dummy;
 	MainFrame::Get()->OnSaveProject(dummy);
 	wxString projectFile = MainFrame::Get()->getProjectName();
@@ -1279,6 +1287,67 @@
         );
 }
 
+bool PanoPanel::CheckGoodSize()
+{
+    vigra::Rect2D cropped_region = pano->getOptions().getROI();
+    unsigned long long int area = ((unsigned long int) cropped_region.width()) * ((unsigned long int) cropped_region.height());
+    // Argh, more than half a gigapixel!
+    if (area > 500000000)
+    {
+        // Tell the user the stitch will be really big, and give them a
+        // chance to reduce the size.
+#if wxCHECK_VERSION(2,9,0)
+        // Untested
+        /** @todo Test this wxWidgets 2.9+ section.
+         *  Eventually remove the the other section.
+         */
+        wxMessageDialog dialog(this,
+                _("Are you sure you want to stitch such a large panorama?"),
+                wxT(""),
+                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."),
+                        area / 1000000000.0));
+        dialog.SetYesNoLabels(_("Stitch anyway"), _("Let me fix that"));
+#else // replacement for old wxWidgets versions.
+        // wxMessageDialog derives from wxDialog, but I don't understand
+        // why because on most platforms wxMessageDialog uses the native
+        // message box, and trying to make descriptive buttons through
+        // wxDialog::CreateStdButtonSizer causes a crash on wxGTK.
+        // Descriptive buttons are recommended by the Windows, Gnome, KDE,
+        // and Apple user interface guidelines.
+        // Due to this wxWidgets WTF, the buttons will are labeled Yes and
+        // No on wxWidgets 2.8 and earlier. This makes it a little
+        // confusing, and it is more likely someone will just click yes
+        // without reading the message and then wonder why their computer
+        // has ground to a halt.
+        /** @todo (Possibly) make a dialog manually with properly labelled
+         * buttons.
+         */
+        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(""),
+                wxICON_EXCLAMATION | wxYES_NO);
+#endif
+        bool result;
+        switch (dialog.ShowModal())
+        {
+            case wxID_OK:
+            case wxID_YES:
+                // Continue stitch.
+                return true;
+                break;
+            default:
+                // bring the user towards the approptiate controls.
+                MainFrame::Get()->ShowStitcherTab();
+                return false;
+        }
+    }
+    // I see nothing wrong with this...
+    return true;
+}
+
 
 IMPLEMENT_DYNAMIC_CLASS(PanoPanel, wxPanel)
 
diff -r 61d3ec192625 -r 847139136070 src/hugin1/hugin/PanoPanel.h
--- a/src/hugin1/hugin/PanoPanel.h	Wed Oct 13 21:56:09 2010 +0200
+++ b/src/hugin1/hugin/PanoPanel.h	Wed Oct 13 21:57:13 2010 +0200
@@ -152,6 +152,18 @@
 
     /** enable/disable control influenced by quick mode */
     void EnableControls(bool enable);
+    
+    /** Check the canvas size isn't overly huge, or the user knows what they are doing.
+     * The canvas size can become too big if, for example, the field of view is
+     * more than 180 degrees, then you select rectilinear proection, then press
+     * "Calculate optimal size", or stitch a wide stereographic image using the
+     * assistant tab.
+     * If the canvas size is unreasonable, this function will display a warning.
+     * The user has the option to continue.
+     * @return true if the canvas size is reasonable, or the user presses
+     * "continue anyway" on the warning, false if the stitch should be aborted 
+     */
+    bool CheckGoodSize();
 
     // the model
     Panorama * pano;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/51cd7e935ea2
changeset: 4485:51cd7e935ea2
user:      tmodes
date:       Sat Oct 16 11:43:46 2010 +0200
description:
Merged

diffstat:

 src/hugin1/hugin/CPListFrame.cpp  |  40 +++++++++++++++++++++++++++++++++++++++
 src/hugin1/hugin/GLPreviewFrame.h |   7 +++++-
 2 files changed, 46 insertions(+), 1 deletions(-)

diffs (140 lines):

diff -r b61307144754 -r 51cd7e935ea2 src/hugin1/hugin/CPListFrame.cpp
--- a/src/hugin1/hugin/CPListFrame.cpp	Sat Oct 16 11:31:57 2010 +0200
+++ b/src/hugin1/hugin/CPListFrame.cpp	Sat Oct 16 11:43:46 2010 +0200
@@ -72,7 +72,11 @@
 
 static Panorama * g_pano;
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareError(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareError(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -84,7 +88,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareErrorGreater(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareErrorGreater(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -96,7 +104,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareCPNr(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareCPNr(long item1, long item2, long sortData)
+#endif
 {
     if (item1 < item2)
         return -1;
@@ -106,7 +118,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareCPNrGreater(long p1, long p2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareCPNrGreater(long p1, long p2, long sortData)
+#endif
 {
     if (p1 > p2)
         return -1;
@@ -116,7 +132,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareImg1Nr(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareImg1Nr(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -128,7 +148,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareImg1NrGreater(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareImg1NrGreater(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -140,7 +164,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareImg2Nr(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareImg2Nr(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -152,7 +180,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareImg2NrGreater(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareImg2NrGreater(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -164,7 +196,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareMode(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareMode(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
@@ -176,7 +212,11 @@
         return 0;
 }
 
+#if wxCHECK_VERSION(2,9,0)
+static int wxCALLBACK compareModeGreater(long item1, long item2, wxIntPtr sortData)
+#else
 static int wxCALLBACK compareModeGreater(long item1, long item2, long sortData)
+#endif
 {
     const ControlPoint &p1 = g_pano->getCtrlPoint(item1);
     const ControlPoint &p2 = g_pano->getCtrlPoint(item2);
diff -r b61307144754 -r 51cd7e935ea2 src/hugin1/hugin/GLPreviewFrame.h
--- a/src/hugin1/hugin/GLPreviewFrame.h	Sat Oct 16 11:31:57 2010 +0200
+++ b/src/hugin1/hugin/GLPreviewFrame.h	Sat Oct 16 11:43:46 2010 +0200
@@ -37,7 +37,12 @@
 class GLViewer;
 class wxSpinEvent;
 class wxChoice;
-class wxInfoBar;
+#if wxCHECK_VERSION(2,9,0)
+//forward declaration for wxInfoBar works only for wxGTK
+//for other systems wxInfoBar is defined as preprocessor macro and not as class
+//class wxInfoBar;
+#include <wx/infobar.h>
+#endif
 
 class PreviewToolHelper;
 class PreviewTool;

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/265abebe7631
changeset: 4705:265abebe7631
user:      tmodes
date:       Fri Dec 10 21:31:55 2010 +0100
description:
Merged

diffstat:

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

diffs (11 lines):

diff -r d6acda86d8a0 -r 265abebe7631 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Wed Dec 08 22:54:35 2010 -0500
+++ b/CMakeModules/win_bundle.cmake	Fri Dec 10 21:31:55 2010 +0100
@@ -93,6 +93,7 @@
 
   # find path to gnu make 
   FIND_PATH(GNUMake_DIR make.exe
+            ${SOURCE_BASE_DIR}/Make-3.82/Release
             ${SOURCE_BASE_DIR}/Make-3.81/Release
             DOC "Location of gnu make"
             NO_DEFAULT_PATH)

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/70a4464571f8
changeset: 4726:70a4464571f8
user:      tmodes
date:       Thu Dec 16 21:19:37 2010 +0100
description:
Merged

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d8e66f50fbee
changeset: 4725:d8e66f50fbee
user:      tmodes
date:       Thu Dec 16 21:18:56 2010 +0100
description:
Merged

diffstat:

 src/translations/cs_CZ.po |  3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diffs (13 lines):

diff -r e65670fab971 -r d8e66f50fbee src/translations/cs_CZ.po
--- a/src/translations/cs_CZ.po	Sat Dec 11 23:51:24 2010 -0500
+++ b/src/translations/cs_CZ.po	Thu Dec 16 21:18:56 2010 +0100
@@ -5734,9 +5734,6 @@
 #~ msgid "Dedication"
 #~ msgstr "Věnování"
 
-#~ msgid "Dedication"
-#~ msgstr "Věnování"
-
 #~ msgid ""
 #~ "The Autopano and Autopano-SIFT programs can be used to create control "
 #~ "points automatically. Please install one of them if you haven't already "

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a75c9fef69ff
changeset: 4805:a75c9fef69ff
user:      tmodes
date:       Fri Jan 07 19:15:16 2011 +0100
description:
Merged

diffstat:

 mac/ExternalPrograms/scripts/enblend.sh |  6 +++---
 mac/ExternalPrograms/scripts/pano13.sh  |  5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 53508ea2ec6f -r a75c9fef69ff mac/ExternalPrograms/scripts/enblend.sh
--- a/mac/ExternalPrograms/scripts/enblend.sh	Fri Jan 07 19:13:49 2011 +0100
+++ b/mac/ExternalPrograms/scripts/enblend.sh	Fri Jan 07 19:15:16 2011 +0100
@@ -125,8 +125,8 @@
 
  env \
    CC=$CC CXX=$CXX \
-   CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
-   CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
+   CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I$REPOSITORYDIR/include/boost -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \
    CPPFLAGS="-I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/OpenEXR -I/usr/include" \
    LIBS="-lGLEW -framework GLUT -lobjc -framework OpenGL -framework AGL" \
    LDFLAGS="-L$REPOSITORYDIR/lib -L/usr/lib -mmacosx-version-min=$OSVERSION -dead_strip" \
@@ -134,7 +134,7 @@
    PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \
    ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \
      --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \
-     --with-glew $extraConfig  || fail "configure step for $ARCH";
+     --with-glew $extraConfig --with-openexr || fail "configure step for $ARCH";
 
  # hack; AC_FUNC_MALLOC sucks!!
 
diff -r 53508ea2ec6f -r a75c9fef69ff mac/ExternalPrograms/scripts/pano13.sh
--- a/mac/ExternalPrograms/scripts/pano13.sh	Fri Jan 07 19:13:49 2011 +0100
+++ b/mac/ExternalPrograms/scripts/pano13.sh	Fri Jan 07 19:15:16 2011 +0100
@@ -24,6 +24,7 @@
 # 20100119.0 sg Support the SVN version of panotools - 2.9.16
 # 201004xx.0 hvdw support 2.9.17
 # 20100624.0 hvdw More robust error checking on compilation
+# 20110107.0 hvdw support for 2.9.18
 # -------------------------------
 
 # init
@@ -54,6 +55,10 @@
         GENERATED_DYLIB_NAME="libpano13.2.dylib";
                                 GENERATED_DYLIB_INSTALL_NAME="libpano13.dylib";
                                 ;;
+  "18")
+        GENERATED_DYLIB_NAME="libpano13.2.dylib";
+                                GENERATED_DYLIB_INSTALL_NAME="libpano13.dylib";
+                                ;;
      *)
         echo "Unknown libpano version $libpanoVsn. Program aborting."
         exit 1

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/0dd018ab252a
changeset: 4853:0dd018ab252a
user:      tmodes
date:       Mon Jan 17 17:55:26 2011 +0100
description:
Merged

diffstat:

 src/hugin1/hugin/xrc/data/upstream.txt                        |   1 +
 src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp |  10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r a7cd27506f76 -r 0dd018ab252a src/hugin1/hugin/xrc/data/upstream.txt
--- a/src/hugin1/hugin/xrc/data/upstream.txt	Mon Jan 17 17:53:45 2011 +0100
+++ b/src/hugin1/hugin/xrc/data/upstream.txt	Mon Jan 17 17:55:26 2011 +0100
@@ -5,6 +5,7 @@
 
 VIGRA: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
 levmar by Manolis Lourakis http://www.ics.forth.gr/~lourakis/levmar
+FLANN by Marius Muja and David G. Lowe, http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN (used unmodified)
 ANN: by David M. Mount and Sunil Arya http://www.cs.umd.edu/~mount/ANN/
 
 The camera response estimation uses the EMoR response model developed 
diff -r a7cd27506f76 -r 0dd018ab252a src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp
--- a/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp	Mon Jan 17 17:53:45 2011 +0100
+++ b/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp	Mon Jan 17 17:55:26 2011 +0100
@@ -55,18 +55,18 @@
 	if (rings.size() == 0) {
 		rings.push_back(1);
 		ring_radius.push_back(0);
-		ring_gradient_width.push_back(0.5);
+		ring_gradient_width.push_back(2);
 		rings.push_back(6);
-		ring_radius.push_back(2.3);
-		ring_gradient_width.push_back(1.3);
+		ring_radius.push_back(4.2);
+		ring_gradient_width.push_back(1.9);
 		/*
 		rings.push_back(6);
 		ring_radius.push_back(5);
 		ring_gradient_width.push_back(3);
 		*/
 		rings.push_back(6);
-		ring_radius.push_back(9);
-		ring_gradient_width.push_back(9);
+		ring_radius.push_back(8);
+		ring_gradient_width.push_back(3.2);
 	}
 
 	assert(rings.size() == ring_radius.size());

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/bfdae1c16551
changeset: 4999:bfdae1c16551
user:      tmodes
date:       Sun Feb 27 14:14:40 2011 +0100
description:
Merged

diffstat:

 src/translations/pt_BR.po |  649 ++++++++++++++++++++++++-------------------------
 1 files changed, 317 insertions(+), 332 deletions(-)

diffs (truncated from 1225 to 500 lines):

diff -r f6d7cbcfbda9 -r bfdae1c16551 src/translations/pt_BR.po
--- a/src/translations/pt_BR.po	Sun Feb 27 14:13:31 2011 +0100
+++ b/src/translations/pt_BR.po	Sun Feb 27 14:14:40 2011 +0100
@@ -4,21 +4,21 @@
 # This file is distributed under the same license as the hugin package.
 #
 # Ademar de Souza Reis Jr. <ademar@...>, 2005, 2006, 2007, 2009.
-# Luís Henrique Camargo Quiroz <luishcq@...>, 2010.
+# Luís Henrique Camargo Quiroz <luishcq@...>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=77506&atid=550441\n"
 "POT-Creation-Date: 2011-01-15 10:30+0100\n"
-"PO-Revision-Date: 2010-12-30 17:44-0300\n"
+"PO-Revision-Date: 2011-01-17 22:38-0200\n"
 "Last-Translator: Luís Henrique Camargo Quiroz <luishcq@..."
 "Language-Team: português (brasileiro) <pt@..."
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
 #, c-format
@@ -266,8 +266,9 @@
 msgid "Version: %s"
 msgstr "Versão: %s"
 
+# c-format
 #: hugin1/hugin/AboutDialog.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "Path to resources: %s"
 msgstr "Caminho para recursos: %s"
 
@@ -300,7 +301,7 @@
 "Please use the Control Points tab to connect all images with control "
 "points.\n"
 msgstr ""
-"Por favor use a tab \"Pontos de Controle\" para conectar todas as imagens "
+"Por favor use a aba \"Pontos de Controle\" para conectar todas as imagens "
 "com pontos de controle.\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:303
@@ -323,7 +324,7 @@
 "movement errors"
 msgstr ""
 "Encaixe ruim, alguns pontos de controle podem não estar alinhados ou há "
-"erros de movimento e parallax."
+"erros de movimento e paralaxe"
 
 #: hugin1/hugin/AssistantPanel.cpp:320
 msgid ""
@@ -333,7 +334,7 @@
 msgstr ""
 "Encaixe muito ruim. Verifique a existência de pontos de controle "
 "desalinhados, parâmetros da lente errados ou imagens com movimento e "
-"parallax. O otimizador pode ter falhado. Intervenção manual requerida."
+"paralaxe. O otimizador pode ter falhado. Intervenção manual requerida."
 
 #: hugin1/hugin/AssistantPanel.cpp:322
 #, c-format
@@ -342,7 +343,6 @@
 
 # advanced tabs - na verdade, quer dizer as demais abas, não é?
 #: hugin1/hugin/AssistantPanel.cpp:330
-#, fuzzy
 msgid ""
 "Note: automatic alignment uses default settings from the preferences. If you "
 "customize settings for this project in the advanced tabs and want to use "
@@ -380,10 +380,10 @@
 "\n"
 "After adding the points, press the \"Align\" button again"
 msgstr ""
-"Por favor crie pontos de controle entre as imagens não conectadas utilizando "
-"a aba de pontos de Pontos de Controle.\n"
-"\n"
-"Após adicionar os pontos, pressione o botão \"Alinhar\" novamente."
+"Por favor, crie pontos de controle entre as imagens não conectadas "
+"utilizando a aba de pontos de Pontos de Controle.\n"
+"\n"
+"Após adicionar os pontos, pressione o botão \"Alinhar\" novamente"
 
 #: hugin1/hugin/AssistantPanel.cpp:431
 msgid ""
@@ -481,8 +481,8 @@
 "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
 "%0.3f %0.3f "
 msgstr ""
-"Ponto refinado, ângulo: %.0f deg, coeficiente de relação: %0.03f, curvatura: "
-"%0.3f %0.3f "
+"Ponto refinado, ângulo: %.0f grau, coeficiente de relação: %0.03f, "
+"curvatura: %0.3f %0.3f "
 
 #: hugin1/hugin/CPEditorPanel.cpp:797 hugin1/hugin/CPEditorPanel.cpp:927
 msgid "change points, or press right mouse button to add the pair"
@@ -769,14 +769,14 @@
 msgid "drag to change the horizontal field of view"
 msgstr "arraste para alterar o campo horizontal de visão"
 
+# haverá palavra melhor?
 #: hugin1/hugin/GLPreviewFrame.cpp:458
 msgid "Panosphere"
-msgstr ""
+msgstr "Panosfera"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:459
-#, fuzzy
 msgid "Mosaic plane"
-msgstr "Biplanar"
+msgstr "Plano do mosaico"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:480 translations/xrc.cpp:403
 #: translations/xrc.cpp:736 translations/xrc.cpp:778 xrc.cpp:403 xrc.cpp:736
@@ -785,7 +785,6 @@
 msgstr "Pré-visualização"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:493 translations/xrc.cpp:806 xrc.cpp:806
-#, fuzzy
 msgid "Overview"
 msgstr "Pré-visualização"
 
@@ -821,7 +820,7 @@
 #: hugin1/hugin/GLPreviewFrame.cpp:1231 hugin1/hugin/NumTransDialog.cpp:77
 #: hugin1/hugin/PreviewFrame.cpp:729
 msgid "Yaw value must be numeric."
-msgstr "Valor precisa ser numérico (yaw)"
+msgstr "Valor precisa ser numérico (yaw)."
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1238 hugin1/hugin/NumTransDialog.cpp:83
 #: hugin1/hugin/PreviewFrame.cpp:735
@@ -858,11 +857,13 @@
 "Switching to panosphere overview mode requires that all images have zero XYZ "
 "parameters. Do you want to set all XYZ parameters to zero for all images?"
 msgstr ""
+"Alternar para o modo de previsão em panosfera requer que todas as imagens "
+"tenham parâmetros XYZ nulos. Você quer zerar os valores de XYZ de todas as "
+"imagens?"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1453
-#, fuzzy
 msgid "Reset XYZ parameters?"
-msgstr "Parâmetros de Lente"
+msgstr "Re-iniciar parâmetros XYZ?"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:1892 hugin1/hugin/PreviewFrame.cpp:232
 msgid "difference"
@@ -939,9 +940,9 @@
 "space."
 msgstr ""
 "Com um campo visual muito grande na vertical, as projeções cilíndricas "
-"tornam-se muito repuxadas no topo e embaixo. \n"
+"tornam-se muito repuxadas no topo e embaixo.\n"
 "Uma projeção equiretangular consegue ajustar a mesma imagem numa altura "
-"menor. "
+"menor."
 
 #: hugin1/hugin/GLPreviewFrame.cpp:2200
 msgid ""
@@ -993,12 +994,11 @@
 "Se quiser vê-la novamente, re-ative a barra nas preferências."
 
 #: hugin1/hugin/GLViewer.cpp:151
-#, fuzzy
 msgid ""
 "Error initializing GLEW\n"
 "Fast preview window can not be opened."
 msgstr ""
-"Erro inicializando GLEW\n"
+"Erro inicializando o GLEW\n"
 "A janela de pré-visualização rápida não pode ser aberta."
 
 # verificar se placa gráfica oferece estes recursos! Verificar se o driver está atualizado.
@@ -1067,7 +1067,6 @@
 msgstr "Equi-sólida"
 
 #: hugin1/hugin/HFOVDialog.cpp:63 hugin1/hugin/ImagesList.cpp:528
-#, fuzzy
 msgid "Fisheye Thoby"
 msgstr "Olho de peixe"
 
@@ -1101,7 +1100,7 @@
 
 #: hugin1/hugin/huginApp.cpp:171 hugin1/ptbatcher/PTBatcherGUI.cpp:75
 msgid "xrc directory not found in bundle"
-msgstr "diretório xrc não encontrado no bundle"
+msgstr "diretório xrc não encontrado no pacote"
 
 #: hugin1/hugin/huginApp.cpp:171 hugin1/hugin/huginApp.cpp:183
 #: hugin1/hugin/huginApp.cpp:196 hugin1/hugin/MainFrame.cpp:1857
@@ -1150,15 +1149,15 @@
 
 #: hugin1/hugin/ImagesList.cpp:359
 msgid "X (TrX)"
-msgstr "x (TrX)"
+msgstr "X (TrX)"
 
 #: hugin1/hugin/ImagesList.cpp:360
 msgid "Y (TrY)"
-msgstr "y (TrY)"
+msgstr "Y (TrY)"
 
 #: hugin1/hugin/ImagesList.cpp:361
 msgid "Z (TrZ)"
-msgstr "z (TrZ)"
+msgstr "Z (TrZ)"
 
 #: hugin1/hugin/ImagesList.cpp:362
 msgid "Anchor"
@@ -1175,7 +1174,7 @@
 
 #: hugin1/hugin/ImagesList.cpp:482
 msgid "Lens no."
-msgstr "Lente"
+msgstr "Lente núm."
 
 #: hugin1/hugin/ImagesList.cpp:483
 msgid "Lens type (f)"
@@ -1391,7 +1390,7 @@
 "If you close without saving, changes since your last save will be discarded"
 msgstr ""
 "Se você sair sem gravar, as alterações feitas após a última gravação serão "
-"perdidas."
+"perdidas"
 
 #: hugin1/hugin/MainFrame.cpp:525
 msgid "Don't Save"
@@ -1858,9 +1857,8 @@
 msgstr "Panini genérica"
 
 #: hugin1/hugin/PanoPanel.cpp:163
-#, fuzzy
 msgid "Thoby Projection"
-msgstr "Projeção"
+msgstr "Projeção de Thoby"
 
 #: hugin1/hugin/PanoPanel.cpp:487 translations/xrc.cpp:545
 #: translations/xrc.cpp:550 xrc.cpp:545 xrc.cpp:550
@@ -1908,7 +1906,7 @@
 "Hugin can not work with this filename. Please enter a valid filename."
 msgstr ""
 "O nome do arquivo contém um dos seguintes caracteres inválidos: %s\n"
-"Hugin não suporta este nome. Favor fornecer um nome válido. "
+"Hugin não suporta este nome. Favor fornecer um nome válido."
 
 #: hugin1/hugin/PanoPanel.cpp:1116
 msgid "Could not execute command: "
@@ -2143,7 +2141,7 @@
 
 #: hugin1/hugin/PreviewFrame.cpp:201
 msgid "projection (f):"
-msgstr "projeção (f)"
+msgstr "projeção (f):"
 
 #: hugin1/hugin/PreviewFrame.cpp:226 translations/xrc.cpp:774 xrc.cpp:774
 msgid "Blend mode:"
@@ -2276,7 +2274,7 @@
 # keypoint = control point?
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:328
 msgid "cleaning up temporary keypoint files"
-msgstr "limpando arquivos de pontos de controle temporários."
+msgstr "limpando arquivos de pontos de controle temporários"
 
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:387
 #, c-format
@@ -2439,7 +2437,7 @@
 
 #: hugin1/nona_gui/nona_gui.cpp:203
 msgid "Could not find project file:"
-msgstr "Não foi possível encontrar o arquivo de projeto"
+msgstr "Não foi possível encontrar o arquivo de projeto:"
 
 #: hugin1/nona_gui/nona_gui.cpp:212
 msgid "Specify output image filename"
@@ -2590,7 +2588,7 @@
 
 #: hugin1/ptbatcher/BatchFrame.cpp:457
 msgid "The prefix of an assistant target can not be changed."
-msgstr "O prefixo de um alvo do assistente não pode ser modificado "
+msgstr "O prefixo de um alvo do assistente não pode ser modificado."
 
 #: hugin1/ptbatcher/BatchFrame.cpp:463
 msgid "Please select a project"
@@ -2705,7 +2703,7 @@
 "If you continue, they will be disregarded.\n"
 "Do you still want to continue?"
 msgstr ""
-"A lista contém panoramanas ainda não processados. \n"
+"A lista contém panoramas ainda não processados. \n"
 "Se você continuar, eles serão desprezados. \n"
 "Ainda deseja continuar?"
 
@@ -2803,7 +2801,7 @@
 
 #: hugin1/ptbatcher/ProjectListBox.cpp:53
 msgid "Status"
-msgstr "Status"
+msgstr "Estado"
 
 #: hugin1/ptbatcher/ProjectListBox.cpp:54
 msgid "Last modified"
@@ -2991,7 +2989,7 @@
 
 #: translations/xrc.cpp:28 xrc.cpp:28
 msgid "HFOV (v):"
-msgstr "HFOV - Campo de Visão Horizontal (v)"
+msgstr "HFOV - Campo de Visão Horizontal (v):"
 
 #: translations/xrc.cpp:29 translations/xrc.cpp:674 translations/xrc.cpp:676
 #: xrc.cpp:29 xrc.cpp:674 xrc.cpp:676
@@ -3129,7 +3127,7 @@
 
 #: translations/xrc.cpp:67 xrc.cpp:67
 msgid "Adds a project to the batch list."
-msgstr "Adiciona um projeto à lista de lotes"
+msgstr "Adiciona um projeto à lista de lotes."
 
 #: translations/xrc.cpp:68 translations/xrc.cpp:111 xrc.cpp:68 xrc.cpp:111
 msgid "Remove project"
@@ -3203,7 +3201,7 @@
 
 #: translations/xrc.cpp:86 xrc.cpp:86
 msgid "Open Batch Stitcher help."
-msgstr "Abre a ajuda do Montador em Lotes"
+msgstr "Abre a ajuda do Montador em Lotes."
 
 #: translations/xrc.cpp:89 xrc.cpp:89
 msgid "clear"
@@ -3328,7 +3326,7 @@
 
 #: translations/xrc.cpp:126 xrc.cpp:126
 msgid "One step detector"
-msgstr "Deteção em uma etapa"
+msgstr "Detecção em uma etapa"
 
 #: translations/xrc.cpp:127 translations/xrc.cpp:140 xrc.cpp:127 xrc.cpp:140
 msgid "Program:"
@@ -3346,7 +3344,7 @@
 
 #: translations/xrc.cpp:131 xrc.cpp:131
 msgid "Two step detector"
-msgstr "Deteção em duas etapas"
+msgstr "Detecção em duas etapas"
 
 # está bom?
 #: translations/xrc.cpp:132 xrc.cpp:132
@@ -3359,12 +3357,12 @@
 
 #: translations/xrc.cpp:138 xrc.cpp:138
 msgid "Detector for stacks"
-msgstr "Detetor para pilhas"
+msgstr "Detector para pilhas"
 
 #: translations/xrc.cpp:139 xrc.cpp:139
 msgid "Leave empty, when no control point detector should run on stacks."
 msgstr ""
-"Deixar em branco se não for para usar um detetor de pontos de controle em "
+"Deixar em branco se não for para usar um detector de pontos de controle em "
 "pilhas."
 
 #: translations/xrc.cpp:143 xrc.cpp:143
@@ -3490,7 +3488,7 @@
 
 #: translations/xrc.cpp:170 translations/xrc.cpp:682 xrc.cpp:170 xrc.cpp:682
 msgid "Delete"
-msgstr "Deletar "
+msgstr "Apagar"
 
 #: translations/xrc.cpp:171 xrc.cpp:171
 msgid "Select by Distance"
@@ -3543,7 +3541,7 @@
 
 #: translations/xrc.cpp:182 xrc.cpp:182
 msgid "Add individual images..."
-msgstr "Adicionar fotos individualmente"
+msgstr "Adicionar fotos individualmente..."
 
 #: translations/xrc.cpp:183 xrc.cpp:183
 msgid "Load one or more pictures for this project"
@@ -3551,11 +3549,11 @@
 
 #: translations/xrc.cpp:184 xrc.cpp:184
 msgid "Add time-series of images..."
-msgstr "Adicionar sequência de fotos"
+msgstr "Adicionar seqüência de fotos..."
 
 #: translations/xrc.cpp:185 xrc.cpp:185
 msgid "Load a set of pictures taken at the same time"
-msgstr "Carrega um conjunto de fotos tiradas em sequência"
+msgstr "Carrega um conjunto de fotos tiradas em seqüência"
 
 #: translations/xrc.cpp:186 translations/xrc.cpp:683 xrc.cpp:186 xrc.cpp:683
 msgid "Move up"
@@ -3622,7 +3620,7 @@
 
 #: translations/xrc.cpp:202 xrc.cpp:202
 msgid "Set yaw for selected image(s)"
-msgstr "Ajusta o valor YAW para a(s) imagem(s) selecionada(s)"
+msgstr "Ajusta o valor yaw (guinada) para a(s) imagem(s) selecionada(s)"
 
 #: translations/xrc.cpp:203 xrc.cpp:203
 msgid "pitch:"
@@ -3630,7 +3628,8 @@
 
 #: translations/xrc.cpp:204 xrc.cpp:204
 msgid "Set pitch for selected image(s)"
-msgstr "Ajusta o valor de pitch para a(s) imagem(s) selecionada(s)"
+msgstr ""
+"Ajusta o valor de pitch (inclinação) para a(s) imagem(s) selecionada(s)"
 
 #: translations/xrc.cpp:205 xrc.cpp:205
 msgid "roll:"
@@ -3660,7 +3659,7 @@
 
 #: translations/xrc.cpp:210 xrc.cpp:210
 msgid "set yaw for selected image(s)"
-msgstr "Ajusta o valor quinada (\"yaw\") para a(s) imagem(s) selecionada(s)"
+msgstr "Ajusta o valor guinada (\"yaw\") para a(s) imagem(s) selecionada(s)"
 
 #: translations/xrc.cpp:211 translations/xrc.cpp:464 translations/xrc.cpp:794
 #: xrc.cpp:211 xrc.cpp:464 xrc.cpp:794
@@ -3696,7 +3695,7 @@
 
 #: translations/xrc.cpp:219 xrc.cpp:219
 msgid "Points per Overlap:"
-msgstr "Pontos por Sobreposição"
+msgstr "Pontos por Sobreposição:"
 
 #: translations/xrc.cpp:220 xrc.cpp:220
 msgid "number of points created at each overlap"
@@ -3719,8 +3718,8 @@
 "Use currently selected image as anchor image. That is, do not optimize the "
 "(complete) position of this image"
 msgstr ""
-"Use a imagem selecionada como imagem âncora. Isto é, não otimize a aposição "
-"(completa) dessa imagem."
+"Use a imagem selecionada como imagem âncora. Isto é, não otimize a posição "
+"(completa) dessa imagem"
 
 #: translations/xrc.cpp:226 xrc.cpp:226
 msgid "Anchor this image for exposure"
@@ -3883,32 +3882,28 @@
 msgstr "Exposição e Cor"
 
 #: translations/xrc.cpp:272 xrc.cpp:272
-#, fuzzy
 msgid "Exposure (Eev)"
 msgstr "Exposição (EV)"
 
 #: translations/xrc.cpp:274 xrc.cpp:274
-#, fuzzy
 msgid "Red multiplier (Er):"
-msgstr "Multiplicador vermelho:"
+msgstr "Multiplicador vermelho (Er):"
 
 #: translations/xrc.cpp:276 xrc.cpp:276
-#, fuzzy
 msgid "Blue multiplier (Eb):"
-msgstr "Multiplicador azul:"
+msgstr "Multiplicador azul (Eb):"
 
 #: translations/xrc.cpp:278 xrc.cpp:278
 msgid "Vignetting  (Vb, Vc, Vd)"
-msgstr ""
+msgstr "Vignette (Vb, Vc, Vd)"
 
 #: translations/xrc.cpp:280 xrc.cpp:280
-#, fuzzy
 msgid "Vignetting Center Shift (Vx, Vy)"
-msgstr "Deslocamento do Centro Vignette"
+msgstr "Deslocamento do Centro Vignette (Vx, Vy)"
 
 #: translations/xrc.cpp:282 xrc.cpp:282
 msgid "Camera Response (Ra, Rb, Rc, Rd, Re)"
-msgstr ""
+msgstr "Resposta da câmera (Ra, Rb, Rc, Rd, Re)"
 
 #: translations/xrc.cpp:284 xrc.cpp:284
 msgid "custom (EMoR)"
@@ -3953,7 +3948,7 @@
 
 #: translations/xrc.cpp:302 translations/xrc.cpp:378 xrc.cpp:302 xrc.cpp:378
 msgid "Open project"
-msgstr "Abir projeto"
+msgstr "Abrir projeto"
 
 #: translations/xrc.cpp:303 xrc.cpp:303
 msgid "&Save"
@@ -4005,7 +4000,7 @@
 
 #: translations/xrc.cpp:314 xrc.cpp:314
 msgid "Opens PTBatcher, the batch processor for Hugin's project files"
-msgstr "Abre o PTBatcher, o processador de projetos do Hugin em lotes."
+msgstr "Abre o PTBatcher, o processador de projetos em lotes do Hugin"
 
 #: translations/xrc.cpp:315 xrc.cpp:315

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a5da0e2a507e
changeset: 5093:a5da0e2a507e
user:      tmodes
date:       Mon Mar 07 18:05:08 2011 +0100
description:
Merged

diffstat:

 doc/align_image_stack.pod    |  1 -
 doc/autooptimiser.pod        |  1 -
 doc/celeste_standalone.pod   |  3 +--
 doc/deghosting_mask.pod      |  2 ++
 doc/fulla.pod                |  1 -
 doc/hugin.pod                |  1 -
 doc/hugin_hdrmerge.pod       |  1 -
 doc/hugin_stitch_project.pod |  1 -
 doc/nona.pod                 |  3 ++-
 doc/nona_gui.pod             |  1 -
 doc/pto2mk.pod               |  1 -
 doc/tca_correct.pod          |  1 -
 doc/vig_optimize.pod         |  1 -
 13 files changed, 5 insertions(+), 13 deletions(-)

diffs (162 lines):

diff -r c23f16903996 -r a5da0e2a507e doc/align_image_stack.pod
--- a/doc/align_image_stack.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/align_image_stack.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 align_image_stack - Align overlapping images for HDR or focus stack creation
 
-
 =head1 SYNOPSIS
 
 B<align_image_stack> [options] I<input files>
diff -r c23f16903996 -r a5da0e2a507e doc/autooptimiser.pod
--- a/doc/autooptimiser.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/autooptimiser.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 autooptimiser - Optimize image positions
 
-
 =head1 SYNOPSIS
 
 B<autooptimiser> [options] I<project.pto>
diff -r c23f16903996 -r a5da0e2a507e doc/celeste_standalone.pod
--- a/doc/celeste_standalone.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/celeste_standalone.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -2,7 +2,6 @@
 
 celeste_standalone - Cloud identification
 
-
 =head1 SYNOPSIS
 
 B<celeste_standalone> [options] I<image1> I<image2> I<[..]>
@@ -61,7 +60,7 @@
 =item B<-h>
 
 Print usage.
- 
+
 =back
 
 =head1 AUTHORS
diff -r c23f16903996 -r a5da0e2a507e doc/deghosting_mask.pod
--- a/doc/deghosting_mask.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/deghosting_mask.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -83,6 +83,8 @@
 
 Verbose, repeat for more verbose output
 
+=back
+
 =head1 AUTHORS
 
 Lukáš Jirkovský
diff -r c23f16903996 -r a5da0e2a507e doc/fulla.pod
--- a/doc/fulla.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/fulla.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 fulla - Correct lens distortion, vignetting and chromatic aberration
 
-
 =head1 SYNOPSIS
 
 B<fulla> [options] I<inputfile(s)>
diff -r c23f16903996 -r a5da0e2a507e doc/hugin.pod
--- a/doc/hugin.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/hugin.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 hugin - Hugin panorama creator
 
-
 =head1 SYNOPSIS
 
 B<hugin> I<project_file|image files ...>
diff -r c23f16903996 -r a5da0e2a507e doc/hugin_hdrmerge.pod
--- a/doc/hugin_hdrmerge.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/hugin_hdrmerge.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 hugin_hdrmerge - Merge overlapping images
 
-
 =head1 SYNOPSIS
 
 B<hugin_hdrmerge> [options] B<-o> I<output.exr> I<input-files>
diff -r c23f16903996 -r a5da0e2a507e doc/hugin_stitch_project.pod
--- a/doc/hugin_stitch_project.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/hugin_stitch_project.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 hugin_stitch_project - Stitch a hugin project
 
-
 =head1 SYNOPSIS
 
 B<hugin_stitch_project> [options] [I<<project>> I<<images>> ...]
diff -r c23f16903996 -r a5da0e2a507e doc/nona.pod
--- a/doc/nona.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/nona.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 nona - Stitch a panorama image
 
-
 =head1 SYNOPSIS
 
 B<nona> [options] B<-o> I<output> I<project_file> (image files)
@@ -124,6 +123,8 @@
 
 =back
 
+=back
+
 
 
 =head1 AUTHORS
diff -r c23f16903996 -r a5da0e2a507e doc/nona_gui.pod
--- a/doc/nona_gui.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/nona_gui.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 nona_gui - Graphical interface for nona
 
-
 =head1 SYNOPSIS
 
 B<nona_gui> [options] [I<<project>> I<<images ...>>]
diff -r c23f16903996 -r a5da0e2a507e doc/pto2mk.pod
--- a/doc/pto2mk.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/pto2mk.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -2,7 +2,6 @@
 
 pto2mk - Generate hugin stitching Makefiles
 
-
 =head1 SYNOPSIS
 
 B<pto2mk> B<-o> I<<output_makefile>> B<-p> I<<output_prefix>> I<project_file>
diff -r c23f16903996 -r a5da0e2a507e doc/tca_correct.pod
--- a/doc/tca_correct.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/tca_correct.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -2,7 +2,6 @@
 
 tca_correct - Calculate transverse chromatic aberration
 
-
 =head1 SYNOPSIS
 
 B<tca_correct> [options] I<inputfile>
diff -r c23f16903996 -r a5da0e2a507e doc/vig_optimize.pod
--- a/doc/vig_optimize.pod	Mon Mar 07 18:04:21 2011 +0100
+++ b/doc/vig_optimize.pod	Mon Mar 07 18:05:08 2011 +0100
@@ -8,7 +8,6 @@
 
 vig_optimize - Optimise photometric parameters
 
-
 =head1 SYNOPSIS
 
 B<vig_optimize> [options] B<-o> I<output.pto> I<input.pto>

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/fd9de846ad5a
changeset: 5122:fd9de846ad5a
user:      tmodes
date:       Mon Mar 14 19:31:11 2011 +0100
description:
Merged

diffstat:

 doc/releases/hugin-2011.0.0_beta3.txt |  59 +++++++++--------------------
 1 files changed, 19 insertions(+), 40 deletions(-)

diffs (113 lines):

diff -r ff5b5d0f94e3 -r fd9de846ad5a doc/releases/hugin-2011.0.0_beta3.txt
--- a/doc/releases/hugin-2011.0.0_beta3.txt	Mon Mar 14 19:25:35 2011 +0100
+++ b/doc/releases/hugin-2011.0.0_beta3.txt	Mon Mar 14 19:31:11 2011 +0100
@@ -1,6 +1,5 @@
 Hugin-2011.0.0_beta3 RELEASE NOTES
 
-
 ABOUT
 
 Hugin is more than just a panorama stitcher.  A new version is available.
@@ -33,11 +32,11 @@
 
 This is a source code release.  For executables see below.
 
-This tarball is equivalent to rev/changeset __EDIT__ in our Mercurial
+This tarball is equivalent to rev/changeset 5114:dc55ab270363 in our Mercurial
 repository, where it is also tagged 2011.0beta3
 
 Verify its SHA1SUM
-__EDIT__
+60f65a73c98986004ddacf5d4fee64dbab3e8166  hugin-2011.0.0_beta3.tar.bz2
 
 
 EXECUTABLES
@@ -60,7 +59,10 @@
 
 Updated since the last beta tarball:
 * British English (Garreth Jones)
-* Deutsch (Carl von Einem)
+* Dutch (Harry van der Wolf)
+* German (Carl von Einem)
+* Hungarian (Lajos Höss)
+* Italian (Cristian Marchi)
 
 New strings have been added.  Now is a good time to help update your language.
 Instructions at http://wiki.panotools.org/Hugin_translation_guide
@@ -78,19 +80,12 @@
 http://groups.google.com/group/hugin-ptx/t/44f1834f0d18c2d8
 http://groups.google.com/group/hugin-ptx/t/2c24c7938309a241
 
-Entries are still accepted and voting goes on until a few days before the
-first release candidate.
+Voting goes on until a few days before the first release candidate.
 
-If you miss this cycle you will get an opportunity to enter your
+If you miss this cycle you may get an opportunity to enter your
 artwork for the next release cycle.
 
 
-DEDICATION
-
-This release of Hugin is dedicated to Claudius Ptolemaeus and Marinus of Tyre.
-Details in the About menu.
-
-
 CHANGES SINCE 2010.4.0
 
 Only two months have passed since our last release and yet there have been
@@ -137,9 +132,9 @@
 
 * Man pages are now compressed and the generation is integrated in the CMake
   process (Linux).
-* New Thoby projection modeling 10.5mm Nikkor fisheye lens
-* Improved support for some keyboard shortcuts
-* New Preferences: output file format (LDR only)
+* New Thoby projection modeling 10.5mm Nikkor fisheye lens.
+* Improved support for some keyboard shortcuts.
+* New Preferences: output file format (LDR only).
 * This release has the usual bugfixes and adds minor features.
 
 
@@ -170,33 +165,17 @@
 
 _Compiling_
 
-For users compiling from source:
-* Hugin uses the wxWidgets GUI toolkit version >=2.7.0.
-  2.9 support is experimental. 2.8.11 is recommended.
-* boost >=1.34 is required.  The following boost libraries are used:
-   * filesystem
-   * graph
-   * iostreams
-   * regex
-   * signals
-   * system
-   * thread
-* Hugin requires a libtiff library with LZW support.
-* Hugin depends on libpano13 version >=2.9.18
-* Hugin requires GLEW the OpenGL Extension Wrangler Library,
-  freeglut the OpenGL utility toolkit, and libGLU the OpenGL utility library.
-* On Linux/Unix systems, libraries are now installed in a private location.
-  This simplifies things for users who want to run multiple versions of Hugin
-  simultaneously.
-* On Linux/Unix systems, Hugin can be compiled with gcc-4.4.4, gcc-4.5.1,
-  and gcc-4.6.
-* On Windows, Hugin can be compiled with MSVC 2008 and MSVC 2010.
-  The (free) Express Edition is enough, although it lacks OpenMP support.
-* The build process requires CMake version >=2.8
+Users compiling from source refer to the dependencies listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
 
-For more information, see the README and INSTALL_cmake files and
+and the build processes listed at
 http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
 
+More information in the README and INSTALL_cmake files and at
+
+
+THANKS
+
 Thanks to all the contributors to this release and members of the hugin-ptx
 mailing list, too many to mention here.

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/891d79e8232b
changeset: 5121:891d79e8232b
user:      tmodes
date:       Mon Mar 14 19:29:56 2011 +0100
description:
Merged

diffstat:

 .hgtags   |      1 +
 ChangeLog |  15764 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 15765 insertions(+), 0 deletions(-)

diffs (truncated from 16111 to 500 lines):

diff -r a4574e82c175 -r 891d79e8232b .hgtags
--- a/.hgtags	Mon Mar 14 19:25:35 2011 +0100
+++ b/.hgtags	Mon Mar 14 19:29:56 2011 +0100
@@ -25,3 +25,4 @@
 e5cc4d861c2d7a934a06fcaa9fb2d37cfbe070af 2011.0beta1
 f55647cf469335c7663c7ba6b78101212cfe0876 2011.0beta1
 f7ea2426b8de94ded6e74b6d8db67ef79e722360 2011.0beta2
+dc55ab27036334b7b8e6ba9bef871be59d854f67 2011.0beta3
diff -r a4574e82c175 -r 891d79e8232b ChangeLog
--- a/ChangeLog	Mon Mar 14 19:25:35 2011 +0100
+++ b/ChangeLog	Mon Mar 14 19:29:56 2011 +0100
@@ -1,3 +1,245 @@
+2011-03-13 19:51 +0100  tmodes  <tmodes>  (f9e2e6ed3e61)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	Set image toggle button size to default Last changes results in too
+	big buttons
+
+2011-03-13 19:51 +0100  tmodes  <tmodes>  (dc7e1537f2b7)
+
+	* src/hugin1/hugin/AboutDialog.cpp:
+	Revert partially some changes: m_logo is no pointer, so don't set to
+	NULL
+
+2011-03-13 14:20 -0400  Yuval Levy  <yuv@...>  (3a274f80c25f)
+
+	* src/hugin1/hugin/AboutDialog.cpp:
+	trying to fix bug# 733793
+
+2011-03-13 13:19 -0400  Yuval Levy  <yuv@...>  (aa3b40f4ad21)
+
+	* CMakeLists.txt:
+	no need to specify branch with --follow options of hg log
+
+2011-03-13 13:14 -0400  Yuval Levy  <yuv@...>  (73db84749bfd)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	toggle buttons in fast preview were still too small on default
+	Kubuntu
+
+2011-03-13 16:17 +0100  tmodes  <tmodes>  (0b204475079d)
+
+	* src/hugin1/hugin/AboutDialog.cpp:
+	Fixes crash in about window [733793]
+
+2011-03-13 15:26 +0100  tmodes  <tmodes>  (35210d7fd5f4)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp, src/hugin1/hugin/MainFrame.cpp:
+	Fixes initialisation of overview window on Mac [731734]
+
+2011-03-13 09:12 +0100  tmodes  <tmodes>  (5f15f569cdc8)
+
+	* src/hugin1/hugin/MainFrame.cpp, src/hugin1/hugin/PanoPanel.cpp,
+	src/hugin1/hugin/huginApp.cpp, src/hugin_base/hugin_utils/utils.cpp,
+	src/hugin_base/hugin_utils/utils.h:
+	Propose correct and valid filename for saving project and stitching
+	[731217]
+
+2011-03-12 11:35 -0500  Yuv Mobile  <yuv@...>  (315050341fea)
+
+	* CMakeLists.txt:
+	update log generating command for the specific branch
+
+2011-03-11 17:54 +0100  tmodes  <tmodes>  (45dc653144f3)
+
+	* src/hugin_base/panodata/SrcPanoImage.cpp:
+	Fixes metadata reading for newer Olympus cameras [732359] The used
+	tag FocalPlaneDialog was moved into Equipment sub-directory. So try
+	to read from this sub-directory.
+
+2011-03-09 20:25 +0100  tmodes  <tmodes>  (2c3545696c83)
+
+	* src/translations/hu.po:
+	Updated hungarian translation (Lajos Höss)
+
+2011-03-07 18:04 +0100  tmodes  <tmodes>  (6fcad1e7af5c)
+
+	* src/hugin1/PT/PanoCommand.h, src/hugin1/hugin/LensPanel.cpp:
+	Fixes reset exposure on Lens panel The introduction of the
+	CombinedPanoCommand in f71ccb911ead does not correctly reset the
+	output exposure value of the panorama. Fixes this by an extra
+	ResetMeanExposure PanoCommand.
+
+2011-03-06 14:16 +0100  tmodes  <tmodes>  (a1d2b90c2c84)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	Update layout scale also for overview window after switching mode
+
+2011-03-06 14:16 +0100  tmodes  <tmodes>  (d68e47ace668)
+
+	* src/hugin1/hugin/OverviewOutlinesTool.cpp,
+	src/hugin1/hugin/PanosphereSphereTool.cpp,
+	src/hugin1/hugin/TextureManager.cpp:
+	Fixes some color/intensity issue in overview window
+
+2011-03-06 14:15 +0100  tmodes  <tmodes>  (95db7bd4c3b4)
+
+	* src/hugin1/hugin/PanosphereSphereTool.cpp,
+	src/hugin1/hugin/PanosphereSphereTool.h:
+	Draw panosphere above images and not below [726186]
+
+2011-03-01 18:30 +0100  harryvanderwolf  <hvdwolf@...>  (3e3907665346)
+
+	* src/translations/nl.po:
+	Updated dutch translation
+
+2011-03-01 13:53 +0100  mcri  <mcri>  (94e1c2bfc34b)
+
+	* src/translations/it.po:
+	Updated Italian translation
+
+2011-03-02 18:39 +0100  tmodes  <tmodes>  (4ef317be5962)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	Fixes crash in gray color picker [727449]
+
+2011-03-01 19:55 +0100  tmodes  <tmodes>  (54ebce159126)
+
+	* src/hugin1/hugin/MainFrame.cpp:
+	Set explicit focus for main window for GTK Should improve keyboard
+	handling
+
+2011-03-01 19:55 +0100  tmodes  <tmodes>  (b39b4d4cd881)
+
+	* src/hugin1/hugin/PreferencesDialog.cpp:
+	Fixes background color for wxWidgets 2.9
+
+2011-03-01 20:24 +0100  tmodes  <tmodes>  (62873b20703b)
+
+	* src/translations/de.po:
+	Small typo in german translation
+
+2011-02-28 20:13 +0100  harryvanderwolf  <hvdwolf@...>  (f608c0cb7086)
+
+	* mac/Hugin.xcodeproj/project.pbxproj:
+	[OSX] lots of minor changes to XCode project to make it compilable
+	again after many trunk changes
+
+2011-02-28 19:06 -0500  Yuval Levy  <yuv@...>  (5338677e592c)
+
+	* src/translations/de.po:
+	Updated de translation (Carl von Einem)
+
+2011-02-28 19:06 -0500  Yuval Levy  <yuv@...>  (09e740e2e279)
+
+	* src/translations/en_GB.po:
+	Updated en_GB translation (Gareth Jones)
+
+2011-02-28 18:58 -0500  Yuval Levy  <yuv@...>  (0beb7742c736)
+
+	* CMakeLists.txt:
+	CMake 2.8 is now required (Peter Suetterlin)
+
+2011-02-28 22:48 +0100  tmodes  <tmodes>  (a65c180a1da2)
+
+	* src/hugin_base/nona/Stitcher.h:
+	Save also ICC profile in output [709561]
+
+2011-02-28 22:18 +0100  tmodes  <tmodes>  (8ff99198712a)
+
+	* src/hugin_base/algorithms/nona/NonaImageStitcher.cpp,
+	src/hugin_base/algorithms/nona/NonaImageStitcher.h: deleted file.
+	* src/hugin_base/CMakeLists.txt,
+	src/hugin_base/algorithms/nona/NonaImageStitcher.cpp,
+	src/hugin_base/algorithms/nona/NonaImageStitcher.h:
+	Remove unused files
+
+2011-02-28 19:41 +0100  tmodes  <tmodes>  (038c0de240d6)
+
+	* src/hugin1/hugin/AboutDialog.cpp, src/hugin1/hugin/AboutDialog.h:
+	Fixes crash in about dialog [726318] Some code cleanup
+
+2011-02-28 18:58 +0100  tmodes  <tmodes>  (e7275252ca9f)
+
+	* src/hugin1/hugin/PreviewColorPickerTool.cpp:
+	Only probe active images with grey picker
+
+2011-02-27 18:30 -0500  Yuval Levy  <yuv@...>  (aa822ad8c9d1)
+
+	* .hgtags:
+	Added tag 2011.0beta2 for changeset f7ea2426b8de
+
+2011-02-27 20:52 +0100  tmodes  <tmodes>  (f7ea2426b8de [2011.0beta2])
+
+	* src/hugin1/hugin/GLViewer.cpp:
+	[Windows] Improved mouse event handling to get mouse wheel events in
+	GLCanvas [725667]
+
+2011-02-27 18:09 +0100  dmakreshanski  <dmakreshanski@...>  (b100f89a898d)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	memory free for the new panosphere_sphere_tool missed in previous
+	commit
+
+2011-02-27 17:29 +0100  dmakreshanski  <dmakreshanski@...>  (8c9f5574237c)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	toggle buttons for images in fast preview now have variable width
+	from 0-9, 10-99 and 100+
+
+2011-02-27 16:24 +0100  dmakreshanski  <dmakreshanski@...>  (6a752a3126ea)
+
+	* src/hugin1/hugin/PanosphereSphereTool.cpp,
+	src/hugin1/hugin/PanosphereSphereTool.h: new file.
+	* src/hugin1/hugin/CMakeLists.txt,
+	src/hugin1/hugin/GLPreviewFrame.cpp,
+	src/hugin1/hugin/GLPreviewFrame.h,
+	src/hugin1/hugin/PanosphereSphereTool.cpp,
+	src/hugin1/hugin/PanosphereSphereTool.h,
+	src/hugin1/hugin/ProjectionGridTool.cpp:
+	separated transparent semi transparent sphere from panosphere
+	projection grid tool
+
+2011-02-27 16:00 +0100  dmakreshanski  <dmakreshanski@...>  (4f69d96e6c47)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp,
+	src/hugin1/hugin/ToolHelper.cpp, src/hugin1/hugin/ToolHelper.h:
+	grid checkbox now disables panosphere grid as well
+
+2011-02-27 17:59 -0500  Yuval Levy  <yuv@...>  (389a9ec2f198)
+
+	* src/hugin1/hugin/xrc/data/dedication.png: new file.
+	* src/hugin1/hugin/xrc/data/dedication.png:
+	added dedication image
+
+2011-02-27 10:40 -0500  Yuval Levy  <yuv@...>  (885272233648)
+
+	* .hgtags:
+	Added tag 2011.0beta1 for changeset f55647cf4693
+
+2011-02-27 10:39 -0500  Yuval Levy  <yuv@...>  (f55647cf4693 [2011.0beta1])
+
+	* ChangeLog, src/hugin1/hugin/AboutDialog.cpp,
+	src/hugin1/hugin/AboutDialog.h, src/hugin1/hugin/xrc/about.xrc,
+	src/hugin1/hugin/xrc/data/dedication.htm,
+	src/hugin1/hugin/xrc/data/splash.png:
+	* Dedication of 2011.0
+	* Placeholder for user contributed splash artwork
+
+2011-02-27 09:05 -0500  Yuval Levy  <yuv@...>  (0831399ea729)
+
+	* .hgtags:
+	Added tag 2011.0beta1 for changeset e5cc4d861c2d
+
+2011-02-27 08:58 -0500  Yuval Levy  <yuv@...>  (e5cc4d861c2d)
+
+	* ChangeLog:
+	Updated ChangeLog
+
+2011-02-27 08:49 -0500  Yuval Levy  <yuv@...>  (0bfb91ff7604)
+
+	* CMakeLists.txt, mac/Version.xcconfig:
+	Bumped up version number
+
 2011-02-27 08:46 -0500  Yuval Levy  <yuv@...>  (9ae332342087)
 
 	* ChangeLog, src/translations/bg.po, src/translations/ca_ES.po,
@@ -51,6 +293,10 @@
 	* authors.txt, src/hugin_base/algorithms/basic/CalculateOptimalROI.h:
 	Merged branch align_stack_stereo
 
+2011-02-26 20:18 -0500  Yuval Levy  <yuv@...>  (9998bab530f4)
+
+	* Closed branch align_stack_stereo
+
 2011-02-26 19:18 -0500  Yuval Levy  <yuv@...>  (10a51481d1e3)
 
 	* src/hugin1/hugin/xrc/images_panel.xrc:
@@ -629,6 +875,19 @@
 	src/hugin_base/panodata/Panorama.cpp:
 	Fixes update of crops [713599]
 
+2011-02-05 09:40 -0500  Yuval Levy  <yuv@...>  (6bc8b5823f8e)
+
+	* authors.txt:
+	added Vladimir Nadvornik to authors
+
+2011-02-05 09:10 -0500  Yuval Levy  <yuv@...>  (36e7649cf137)
+
+	* src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp,
+	src/hugin_base/algorithms/basic/CalculateOptimalROI.h,
+	src/tools/align_image_stack.cpp:
+	Vladimir Nadvornik's Stereo images alignment
+	https://bugs.launchpad.net/hugin/+bug/679753
+
 2011-02-05 11:33 +0100  tmodes  <tmodes>  (db62a1d384db)
 
 	* src/hugin1/hugin/PanoPanel.cpp:
@@ -1251,6 +1510,84 @@
 	Some update on Circular keypoint detector, improved orientation
 	estimation, one keypoint can get multiple orientations.
 
+2011-01-08 22:09 +0100  Pablo d'Angelo  <pablo.dangelo@...>  (199cdb81855f)
+
+	* src/hugin_base/panodata/PanoramaOptions.h:
+	fixed valgrind error, PanoramaOptions::resetProjectParamters() did
+	access uninitialized fields (m_hfov).
+
+2011-01-08 21:37 +0100  Pablo d'Angelo  <pablo.dangelo@...>  (1d0222fea999)
+
+	* src/hugin_cpfind/cpfind/CMakeLists.txt,
+	src/hugin_cpfind/cpfind/PanoDetector.cpp,
+	src/hugin_cpfind/cpfind/PanoDetector.h,
+	src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp:
+	Use flann instead of buildin kd tree
+
+2011-01-08 21:36 +0100  Pablo d'Angelo  <pablo.dangelo@...>  (d4dbd489bb2f)
+
+	* src/hugin_base/panodata/Mask.h:
+	remove warning on initialisation order
+
+2011-01-08 19:40 +0100  Pablo d'Angelo  <pablo.dangelo@...>  (b35065a7aaa7)
+
+	* src/foreign/flann/CMakeLists.txt, src/foreign/flann/README,
+	src/foreign/flann/algorithms/all_indices.h,
+	src/foreign/flann/algorithms/autotuned_index.h,
+	src/foreign/flann/algorithms/composite_index.h,
+	src/foreign/flann/algorithms/dist.h,
+	src/foreign/flann/algorithms/kdtree_index.h,
+	src/foreign/flann/algorithms/kdtree_single_index.h,
+	src/foreign/flann/algorithms/kmeans_index.h,
+	src/foreign/flann/algorithms/linear_index.h,
+	src/foreign/flann/algorithms/nn_index.h,
+	src/foreign/flann/flann.cpp, src/foreign/flann/flann.h,
+	src/foreign/flann/flann.hpp, src/foreign/flann/flann_cpp.cpp,
+	src/foreign/flann/flann_mpi.hpp, src/foreign/flann/general.h,
+	src/foreign/flann/io/hdf5.h, src/foreign/flann/nn/ground_truth.h,
+	src/foreign/flann/nn/index_testing.cpp,
+	src/foreign/flann/nn/index_testing.h,
+	src/foreign/flann/nn/simplex_downhill.h,
+	src/foreign/flann/util/allocator.h, src/foreign/flann/util/heap.h,
+	src/foreign/flann/util/logger.cpp, src/foreign/flann/util/logger.h,
+	src/foreign/flann/util/matrix.h,
+	src/foreign/flann/util/object_factory.h,
+	src/foreign/flann/util/pair_iterator.hpp,
+	src/foreign/flann/util/random.cpp, src/foreign/flann/util/random.h,
+	src/foreign/flann/util/result_set.h,
+	src/foreign/flann/util/sampling.h,
+	src/foreign/flann/util/saving.cpp, src/foreign/flann/util/saving.h,
+	src/foreign/flann/util/timer.h: new file.
+	* src/foreign/CMakeLists.txt, src/foreign/flann/CMakeLists.txt,
+	src/foreign/flann/README,
+	src/foreign/flann/algorithms/all_indices.h,
+	src/foreign/flann/algorithms/autotuned_index.h,
+	src/foreign/flann/algorithms/composite_index.h,
+	src/foreign/flann/algorithms/dist.h,
+	src/foreign/flann/algorithms/kdtree_index.h,
+	src/foreign/flann/algorithms/kdtree_single_index.h,
+	src/foreign/flann/algorithms/kmeans_index.h,
+	src/foreign/flann/algorithms/linear_index.h,
+	src/foreign/flann/algorithms/nn_index.h,
+	src/foreign/flann/flann.cpp, src/foreign/flann/flann.h,
+	src/foreign/flann/flann.hpp, src/foreign/flann/flann_cpp.cpp,
+	src/foreign/flann/flann_mpi.hpp, src/foreign/flann/general.h,
+	src/foreign/flann/io/hdf5.h, src/foreign/flann/nn/ground_truth.h,
+	src/foreign/flann/nn/index_testing.cpp,
+	src/foreign/flann/nn/index_testing.h,
+	src/foreign/flann/nn/simplex_downhill.h,
+	src/foreign/flann/util/allocator.h, src/foreign/flann/util/heap.h,
+	src/foreign/flann/util/logger.cpp, src/foreign/flann/util/logger.h,
+	src/foreign/flann/util/matrix.h,
+	src/foreign/flann/util/object_factory.h,
+	src/foreign/flann/util/pair_iterator.hpp,
+	src/foreign/flann/util/random.cpp, src/foreign/flann/util/random.h,
+	src/foreign/flann/util/result_set.h,
+	src/foreign/flann/util/sampling.h,
+	src/foreign/flann/util/saving.cpp, src/foreign/flann/util/saving.h,
+	src/foreign/flann/util/timer.h:
+	added flann
+
 2011-01-15 12:19 +0100  tmodes  <tmodes>  (24f5f9e132f8)
 
 	* CMakeModules/win_bundle.cmake:
@@ -2695,6 +3032,369 @@
 	Hugin should just do a check for autopano-noop on startup and do a
 	full reset of the control point detectors.
 
+2010-11-06 23:51 +0000  James Legg  <jlegg@...>  (9208b7725045)
+
+	* src/hugin_base/algorithms/basic/TranslatePanorama.cpp,
+	src/hugin_base/algorithms/basic/TranslatePanorama.h: new file.
+	* src/hugin1/hugin/GLPreviewFrame.cpp,
+	src/hugin1/hugin/GLPreviewFrame.h,
+	src/hugin1/hugin/xrc/preview_frame.xrc:
+	Merge more changes from trunk into overview branch.
+
+2010-11-06 22:23 +0000  James Legg  <jlegg@...>  (2df36cc98422)
+
+	* src/hugin1/hugin/GLPreviewFrame.cpp:
+	Properly clean up EventHandlers for the image toggle buttons in the
+	preview when images are removed.
+
+2010-11-06 21:17 +0000  James Legg  <jlegg@...>  (aacb503867de)
+
+	* CMakeModules/FindBoostPython.cmake, Debian/postinst,
+	doc/releases/hugin-0.8.0.txt, doc/releases/hugin-0.8.0_rc1.txt,
+	doc/releases/hugin-0.8.0_rc2.txt, doc/releases/hugin-0.8.0_rc3.txt,
+	doc/releases/hugin-0.8.0_rc4.txt, doc/releases/hugin-0.8.0_rc5.txt,
+	doc/releases/hugin-2009.4.0.txt,
+	doc/releases/hugin-2009.4.0_rc3.txt,
+	doc/releases/hugin-2010.0.0.txt,
+	doc/releases/hugin-2010.0.0_rc1.txt,
+	doc/releases/hugin-2010.2.0.txt,
+	doc/releases/hugin-2010.2.0_beta1.txt,
+	doc/releases/hugin-2010.2.0_beta2.txt,
+	doc/releases/hugin-2010.2.0_rc1.txt,
+	doc/releases/hugin-2010.2.0_rc2.txt, mac/copyExtraTools.sh,
+	platforms/windows/huginsetup/CHANGELOG.txt,
+	platforms/windows/huginsetup/CPGenerators/Autopano-sift-c.nsh,
+	platforms/windows/huginsetup/CPGenerators/Autopano.nsh,
+	platforms/windows/huginsetup/CPGenerators/Match-n-shift.nsh,
+	platforms/windows/huginsetup/CPGenerators/Panomatic.nsh,
+	platforms/windows/huginsetup/Graphics/Hugin-sidebar.bmp,
+	platforms/windows/huginsetup/Graphics/Hugin.bmp,
+	platforms/windows/huginsetup/Graphics/Hugin.png,
+	platforms/windows/huginsetup/Graphics/hugin-installer-icon.ico,
+	platforms/windows/huginsetup/Graphics/hugin-installer-icon.svg,
+	platforms/windows/huginsetup/Graphics/hugin-installer-icon.xcf,
+	platforms/windows/huginsetup/HuginSetup.nsi,
+	platforms/windows/huginsetup/HuginSetup_common.nsh,
+	platforms/windows/huginsetup/HuginSetup_x32.nsi,
+	platforms/windows/huginsetup/HuginSetup_x64.nsi,
+	platforms/windows/huginsetup/Languages/DE.nsh,
+	platforms/windows/huginsetup/Languages/EN.nsh,
+	platforms/windows/huginsetup/Languages/IT.nsh,
+	platforms/windows/huginsetup/Licenses/Autopano.txt,
+	platforms/windows/huginsetup/Licenses/Autopano_IT.txt,
+	platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_DE.txt,
+	platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_EN.txt,
+	platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_IT.txt,
+	platforms/windows/huginsetup/Licenses/GPLv2.txt,
+	platforms/windows/huginsetup/Licenses/Licenses.nsh,
+	platforms/windows/huginsetup/Licenses/Panomatic.txt,
+	platforms/windows/huginsetup/Licenses/Panomatic_IT.txt,
+	platforms/windows/huginsetup/Plugins/nsis7z.dll,
+	platforms/windows/huginsetup/Plugins/nsisunz.dll,
+	platforms/windows/huginsetup/TODO.txt, src/dox/introduction.dox,
+	src/foreign/tclap/Arg.h, src/foreign/tclap/ArgException.h,
+	src/foreign/tclap/CmdLine.h, src/foreign/tclap/CmdLineInterface.h,
+	src/foreign/tclap/CmdLineOutput.h, src/foreign/tclap/Constraint.h,
+	src/foreign/tclap/DocBookOutput.h, src/foreign/tclap/HelpVisitor.h,
+	src/foreign/tclap/IgnoreRestVisitor.h, src/foreign/tclap/MultiArg.h,
+	src/foreign/tclap/MultiSwitchArg.h,
+	src/foreign/tclap/OptionalUnlabeledTracker.h,
+	src/foreign/tclap/StdOutput.h, src/foreign/tclap/SwitchArg.h,
+	src/foreign/tclap/UnlabeledMultiArg.h,
+	src/foreign/tclap/UnlabeledValueArg.h, src/foreign/tclap/ValueArg.h,
+	src/foreign/tclap/ValuesConstraint.h,
+	src/foreign/tclap/VersionVisitor.h, src/foreign/tclap/Visitor.h,
+	src/foreign/tclap/XorHandler.h, src/foreign/zthread/AUTHORS,
+	src/foreign/zthread/COPYING, src/foreign/zthread/LICENSE,
+	src/foreign/zthread/MIT.TXT, src/foreign/zthread/README,
+	src/foreign/zthread/ReadMe.txt,
+	src/foreign/zthread/include/zthread/AtomicCount.h,
+	src/foreign/zthread/include/zthread/Barrier.h,
+	src/foreign/zthread/include/zthread/BiasedReadWriteLock.h,
+	src/foreign/zthread/include/zthread/BlockingQueue.h,
+	src/foreign/zthread/include/zthread/BoundedQueue.h,
+	src/foreign/zthread/include/zthread/Cancelable.h,
+	src/foreign/zthread/include/zthread/ClassLockable.h,
+	src/foreign/zthread/include/zthread/ConcurrentExecutor.h,
+	src/foreign/zthread/include/zthread/Condition.h,
+	src/foreign/zthread/include/zthread/Config.h,
+	src/foreign/zthread/include/zthread/CountedPtr.h,
+	src/foreign/zthread/include/zthread/CountingSemaphore.h,
+	src/foreign/zthread/include/zthread/Exceptions.h,
+	src/foreign/zthread/include/zthread/Executor.h,
+	src/foreign/zthread/include/zthread/FairReadWriteLock.h,
+	src/foreign/zthread/include/zthread/FastMutex.h,
+	src/foreign/zthread/include/zthread/FastRecursiveMutex.h,
+	src/foreign/zthread/include/zthread/Guard.h,
+	src/foreign/zthread/include/zthread/GuardedClass.h,
+	src/foreign/zthread/include/zthread/Lockable.h,
+	src/foreign/zthread/include/zthread/LockedQueue.h,
+	src/foreign/zthread/include/zthread/MonitoredQueue.h,
+	src/foreign/zthread/include/zthread/Mutex.h,
+	src/foreign/zthread/include/zthread/NonCopyable.h,
+	src/foreign/zthread/include/zthread/PoolExecutor.h,
+	src/foreign/zthread/include/zthread/Priority.h,
+	src/foreign/zthread/include/zthread/PriorityCondition.h,
+	src/foreign/zthread/include/zthread/PriorityInheritanceMutex.h,
+	src/foreign/zthread/include/zthread/PriorityMutex.h,
+	src/foreign/zthread/include/zthread/PrioritySemaphore.h,
+	src/foreign/zthread/include/zthread/Queue.h,
+	src/foreign/zthread/include/zthread/ReadWriteLock.h,
+	src/foreign/zthread/include/zthread/RecursiveMutex.h,
+	src/foreign/zthread/include/zthread/Runnable.h,
+	src/foreign/zthread/include/zthread/Semaphore.h,
+	src/foreign/zthread/include/zthread/Singleton.h,
+	src/foreign/zthread/include/zthread/SynchronousExecutor.h,
+	src/foreign/zthread/include/zthread/Task.h,
+	src/foreign/zthread/include/zthread/Thread.h,
+	src/foreign/zthread/include/zthread/ThreadLocal.h,
+	src/foreign/zthread/include/zthread/ThreadLocalImpl.h,
+	src/foreign/zthread/include/zthread/ThreadedExecutor.h,
+	src/foreign/zthread/include/zthread/Time.h,
+	src/foreign/zthread/include/zthread/Waitable.h,
+	src/foreign/zthread/include/zthread/ZThread.h,
+	src/foreign/zthread/share/acinclude.m4, src/foreign/zthread/share
+	/atomic-gcc.m4, src/foreign/zthread/share/atomic-linux.m4,

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/7f8ae9b14a18
changeset:  5538:7f8ae9b14a18
user:       tmodes
date:       Sun Aug 28 17:34:52 2011 +0200
description:

Merged

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |   32 +++++++++--------
 mac/HuginCompleteInstaller.pmproj   |    0 
 mac/complete-tools-package.sh       |   66 ------------------------------------
 src/hugin_script_interface/hsi.i    |    8 ++--
 4 files changed, 21 insertions(+), 85 deletions(-)

diffs (299 lines):

diff -r b0366dd25ac8 -r 7f8ae9b14a18 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Sun Aug 28 17:32:37 2011 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Sun Aug 28 17:34:52 2011 +0200
@@ -769,7 +769,6 @@
 		57EA84720C3A8AB400E4965E /* CalculateMeanExposure.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA84700C3A8AB400E4965E /* CalculateMeanExposure.h */; };
 		57EA97D90C3A940500E4965E /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; };
 		57EA97DA0C3A940500E4965E /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; };
-		7302E00813ADEE4700700CD0 /* open in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7302E00713ADEE1200700CD0 /* open */; };
 		7302E00913ADEE6500700CD0 /* open in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7302E00713ADEE1200700CD0 /* open */; };
 		731006C7126CAA0D00358FDA /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
 		731006C8126CAA0D00358FDA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A964B2124F41870044E1DC /* Cocoa.framework */; };
@@ -933,6 +932,10 @@
 		733EAA19125C5BBA00658EAF /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E347610C4A8F7D006AA781 /* config.h */; };
 		733EAA29125CD89600658EAF /* icpfind.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
 		733EAA5E125CDA8D00658EAF /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		733EF75A13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
+		733EF75B13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
+		733EF75C13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
+		733EF75E13FEC54D00536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
 		734065AA125BA2CA00FC4790 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		734065AB125BA2CA00FC4790 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		734065AC125BA2CA00FC4790 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
@@ -1328,7 +1331,6 @@
 		73A1602A10FB1A0100931D10 /* libPTLensDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F8150C30268F00736343 /* libPTLensDB.a */; };
 		73A8A34313F56F2300BB58F2 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		73A8A34913F56F8100BB58F2 /* hugin_python_interface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
-		73A8A34B13F56F9900BB58F2 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD5813A6B041006A3C54 /* Python.framework */; };
 		73A8A35613F5709500BB58F2 /* hsi_ImageVariableGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A35213F5709500BB58F2 /* hsi_ImageVariableGroup.h */; };
 		73A8A35713F5709500BB58F2 /* hsi_Panorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A35313F5709500BB58F2 /* hsi_Panorama.h */; };
 		73A8A35813F5709500BB58F2 /* hsi_PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A35413F5709500BB58F2 /* hsi_PanoramaData.h */; };
@@ -1367,7 +1369,6 @@
 		73B1AD0E13A6A14D006A3C54 /* hpi_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73B1ACE113A6A014006A3C54 /* hpi_classes.cpp */; };
 		73B1AD0F13A6A14D006A3C54 /* hpi_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 73B1ACE213A6A014006A3C54 /* hpi_classes.h */; };
 		73B1AD3913A6AE00006A3C54 /* swigpyrun.h in Headers */ = {isa = PBXBuildFile; fileRef = 73B1AD3813A6AE00006A3C54 /* swigpyrun.h */; };
-		73B1AD5913A6B041006A3C54 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD5813A6B041006A3C54 /* Python.framework */; };
 		73B3F2F113F69549001E557D /* swigpyrun.h in Headers */ = {isa = PBXBuildFile; fileRef = 73B1AD3813A6AE00006A3C54 /* swigpyrun.h */; };
 		73B3F33013F699B7001E557D /* hsi.i in Headers */ = {isa = PBXBuildFile; fileRef = 73B1ACE613A6A014006A3C54 /* hsi.i */; };
 		73B3F49913F69D33001E557D /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
@@ -1392,6 +1393,7 @@
 		73B3F8E713F6A27F001E557D /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98410FB69FC00839DF3 /* libGLEW.dylib */; };
 		73B3F8E813F6A27F001E557D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		73B3F91813F6A358001E557D /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
+		73B6022613FD874700B56CE1 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD5813A6B041006A3C54 /* Python.framework */; };
 		73BB093D0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
 		73BB093E0FACC71200B04997 /* PanoToolsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */; };
 		73BB093F0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
@@ -2989,7 +2991,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
-				7302E00813ADEE4700700CD0 /* open in Copy Executable Files */,
 				737E498011D3FD74002BA8AE /* align_image_stack in Copy Executable Files */,
 				7359F235126A191100D3291B /* autooptimiser in Copy Executable Files */,
 				7359F236126A191100D3291B /* celeste_standalone in Copy Executable Files */,
@@ -3412,7 +3413,6 @@
 		577786100BF347B80041F8FF /* libIex.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libIex.dylib; path = lib/libIex.dylib; sourceTree = "<group>"; };
 		577786110BF347B80041F8FF /* libIlmThread.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libIlmThread.dylib; path = lib/libIlmThread.dylib; sourceTree = "<group>"; };
 		577786180BF348E90041F8FF /* libHalf.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHalf.dylib; path = lib/libHalf.dylib; sourceTree = "<group>"; };
-		57810AAB0D32D79400F48296 /* complete-embed.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "complete-embed.sh"; sourceTree = "<group>"; };
 		578414E10C313E7500546EAD /* project.pbxproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.pbxproject; name = project.pbxproj; path = Hugin.xcodeproj/project.pbxproj; sourceTree = "<group>"; };
 		5785A08C0C3BA90900DD8BD8 /* StraightenPanorama.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = StraightenPanorama.cpp; path = algorithms/basic/StraightenPanorama.cpp; sourceTree = "<group>"; };
 		5785A08D0C3BA90900DD8BD8 /* StraightenPanorama.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StraightenPanorama.h; path = algorithms/basic/StraightenPanorama.h; sourceTree = "<group>"; };
@@ -3642,6 +3642,7 @@
 		733DF66E117F2384002EC787 /* pto_merge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_merge; sourceTree = BUILT_PRODUCTS_DIR; };
 		733E08CB13AFB4BB00EE081B /* dual_use.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = dual_use.py; path = "hugin_script_interface/plugins-dev/dual_use.py"; sourceTree = "<group>"; };
 		733E08CC13AFB4BB00EE081B /* plugin_skeleton.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = plugin_skeleton.py; path = "hugin_script_interface/plugins-dev/plugin_skeleton.py"; sourceTree = "<group>"; };
+		733EF75913FEC51300536F16 /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
 		7340668D125BB2AF00FC4790 /* CPDetectorDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPDetectorDialog.cpp; sourceTree = "<group>"; };
 		734066E9125BB83400FC4790 /* FindPanoDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindPanoDialog.cpp; sourceTree = "<group>"; };
 		734066EA125BB83400FC4790 /* FailedProjectsDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FailedProjectsDialog.cpp; sourceTree = "<group>"; };
@@ -3805,7 +3806,6 @@
 		7393CEC7115BF296002F3DCA /* hugin_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugin_shared.h; sourceTree = "<group>"; };
 		7396E4601269806E0096D1B3 /* checkpto */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = checkpto; sourceTree = BUILT_PRODUCTS_DIR; };
 		7396E473126980F80096D1B3 /* checkpto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checkpto.cpp; sourceTree = "<group>"; };
-		739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "complete-tools-package.sh"; sourceTree = "<group>"; };
 		739A0DE710FA602200D8E4C7 /* pto2mk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pto2mk.cpp; sourceTree = "<group>"; };
 		739A0EA410FA7A3100D8E4C7 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = "<group>"; };
 		739A0EA510FA7A3100D8E4C7 /* set_environment.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set_environment.txt; sourceTree = "<group>"; };
@@ -4225,6 +4225,7 @@
 				E864E2C610CE8437007AC6E4 /* liblcms.dylib in Frameworks */,
 				E8A7D98610FB6B9E00839DF3 /* libGLEW.dylib in Frameworks */,
 				E8A7D98B10FB6CE300839DF3 /* libexiv2.dylib in Frameworks */,
+				733EF75E13FEC54D00536F16 /* Python.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4744,6 +4745,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				73B6022613FD874700B56CE1 /* Python.framework in Frameworks */,
 				73A8A7C613F598D500BB58F2 /* hugin_python_interface.framework in Frameworks */,
 				737E495F11D3FD74002BA8AE /* Carbon.framework in Frameworks */,
 				737E496111D3FD74002BA8AE /* libiconv.dylib in Frameworks */,
@@ -4779,6 +4781,7 @@
 				737E497811D3FD74002BA8AE /* libGLEW.dylib in Frameworks */,
 				737E497911D3FD74002BA8AE /* libexiv2.dylib in Frameworks */,
 				735F091712DF6F300081D893 /* AGL.framework in Frameworks */,
+				733EF75B13FEC51300536F16 /* Python.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4961,7 +4964,7 @@
 				73B3F49913F69D33001E557D /* HuginVigraImpex.framework in Frameworks */,
 				73A8A34313F56F2300BB58F2 /* HuginBase.framework in Frameworks */,
 				73A8A34913F56F8100BB58F2 /* hugin_python_interface.framework in Frameworks */,
-				73A8A34B13F56F9900BB58F2 /* Python.framework in Frameworks */,
+				733EF75C13FEC51300536F16 /* Python.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5001,8 +5004,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				73B1AD5913A6B041006A3C54 /* Python.framework in Frameworks */,
 				73FDC9D513A7D69C0042030D /* HuginBase.framework in Frameworks */,
+				733EF75A13FEC51300536F16 /* Python.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5191,8 +5194,6 @@
 				571D8C700E213216006D0305 /* patch-xrc.sh */,
 				57A2BC2E0D45422800E9FFEC /* copyExifTool.sh */,
 				576902090D24DBA100A6AD01 /* complete-bundle.sh */,
-				739A0D4810FA599A00D8E4C7 /* complete-tools-package.sh */,
-				57810AAB0D32D79400F48296 /* complete-embed.sh */,
 				73373CED11A2852D00E7A929 /* panomatic-lib.sh */,
 				573E2E440B76AC5100E86281 /* ExternalPrograms */,
 				573E2E5E0B76AD0100E86281 /* Documents */,
@@ -5564,6 +5565,7 @@
 		5745FC05094E1D5400E6B672 /* External */ = {
 			isa = PBXGroup;
 			children = (
+				733EF75913FEC51300536F16 /* Python.framework */,
 				7302E00613ADE56600700CD0 /* Snow Leopard binaries */,
 				5749F84D067B601A00A6EDD4 /* Mac OS SDK */,
 				73EAB5250E86CEA90020D514 /* lib-static */,
@@ -9013,7 +9015,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $ACTION = \"build\" ]\nthen\n sh ../mac/complete-tools-package.sh\nfi\n\nif [ $DEPLOYMENT_POSTPROCESSING = \"YES\" -a $STRIP_INSTALLED_PRODUCT = \"YES\" ]\nthen\n echo \"Stripping libraries: $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\"\n strip -x $TARGET_BUILD_DIR/$PRODUCT_NAME/Libraries/*.dylib\nfi";
+			shellScript = "#if [ $ACTION = \"build\" ]\n#then\n# sh ../mac/complete-tools-package.sh\n#fi\n\n# $Id: complete-tools-package.sh $\n\ndylib_dir=\"$REPOSITORY_DIR/lib\"\nold_install_name_dirname=\"$REPOSITORY_ABSOLUTE_PATH/lib\"\ndylib_install_loc=\"Libraries\"\nnew_install_name_dirname=\"@executable_path/../$dylib_install_loc\"\n\n# Package is not really a correct name as it is a folder mimicing an OSX application\nPackage=\"$TARGET_BUILD_DIR/Hugin_tools\"\n\narchs=\"ppc i386 x86_64\"\nlibs=\"libwx_macu-$WX_MAJOR_VERSION libwx_macu_gl-$WX_MAJOR_VERSION libpano13 $BOOST_THREAD_LIB-$BOOST_VER $BOOST_DATE_TIME_LIB-$BOOST_VER $BOOST_FILESYSTEM_LIB-$BOOST_VER $BOOST_IOSTREAMS_LIB-$BOOST_VER $BOOST_REGEX_LIB-$BOOST_VER $BOOST_SYSTEM_LIB-$BOOST_VER libpng libtiff libjpeg libIex libImath libIlmImf libIlmThread libHalf libexpat liblcms libintl libgettextsrc-$GETTEXT_VERSION libgettextpo libgettextlib-$GETTEXT_VERSION libasprintf libexiv2 libGLEW libxmi libiconv\" \n\n# these are the \"internal\" Hugin tools\nbins=\"align_image_stack autooptimiser celeste_standalone checkpto cpclean deghosting_mask fulla hugin_hdrmerge matchpoint nona pano_trafo pto2mk tca_correct vig_optimize\"\n# these are the external tools. Note: due to license restrictions autopano-sift-c and panomatic are not copied in\next_bins=\"enblend enfuse PTblender PTcrop PTinfo PTmasker PTmender PToptimizer PTroller PTtiff2psd PTtiffdump PTuncrop\"\n\nbinaries=\"$Package/$dylib_install_loc/*.dylib $Package/bin/* $Package/Frameworks/Hugin*.framework/Hugin*\"\n\n#------------------------------------------------\n\nrm -Rf $Package\nmkdir -p $Package\ncp -Rf ../mac/Hugin_tools/* $Package\nmkdir -p \"$Package/$dylib_install_loc\" \"$Package/Frameworks\" \"$Package/bin\"\nfor bin in $bins\ndo\n cp $TARGET_BUILD_DIR/$bin \"$Package/bin/\" \ndone\nfor ext_bin in $ext_bins\ndo\n cp $REPOSITORY_DIR/bin/$ext_bin \"$Package/bin/\" \ndone\ncp -Rf  $TARGET_BUILD_DIR/Hugin*.framework \"$Package/Frameworks\"\n\nfor dylib in $libs\ndo\n cp -Rf $dylib_dir/$dylib.*ylib \"$

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a6a6198d9537
changeset:  5574:a6a6198d9537
user:       tmodes
date:       Thu Sep 15 21:47:21 2011 +0200
description:

Merged

diffstat:

 mac/Hugin.xcodeproj/project.pbxproj |  1886 +++++++++++++++++++++++++++++++---
 mac/complete-bundle.sh              |     4 +-
 mac/hugin_base-Info.plist           |     4 +-
 src/hugin_config_mac.h              |     3 -
 src/hugin_config_mac_python.h       |    97 +
 5 files changed, 1825 insertions(+), 169 deletions(-)

diffs (truncated from 2296 to 500 lines):

diff -r 906d3ea743c9 -r a6a6198d9537 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Thu Sep 15 21:45:44 2011 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Thu Sep 15 21:47:21 2011 +0200
@@ -39,7 +39,6 @@
 				73C5F82112E2FAC00033A6E1 /* PBXTargetDependency */,
 				73A95EB4124887530076D3FB /* PBXTargetDependency */,
 				73FE2B361249194B0002E246 /* PBXTargetDependency */,
-				7354FD6213F3FAD7005940D0 /* PBXTargetDependency */,
 			);
 			name = frameworks;
 			productName = "lib dynamic";
@@ -187,6 +186,62 @@
 			name = Apps;
 			productName = app;
 		};
+		7392853814225D930051CAEC /* configure python version */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 7392853F14225D930051CAEC /* Build configuration list for PBXAggregateTarget "configure python version" */;
+			buildPhases = (
+			);
+			dependencies = (
+				7392853914225D930051CAEC /* PBXTargetDependency */,
+				7392853B14225D930051CAEC /* PBXTargetDependency */,
+				7392855E14225EE60051CAEC /* PBXTargetDependency */,
+			);
+			name = "configure python version";
+			productName = "copy hugin_config.h";
+		};
+		7392855714225E6A0051CAEC /* copy hugin_config.h python version */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 7392855914225E6A0051CAEC /* Build configuration list for PBXAggregateTarget "copy hugin_config.h python version" */;
+			buildPhases = (
+				7392855814225E6A0051CAEC /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "copy hugin_config.h python version";
+			productName = "copy hugin_config.h";
+		};
+		7392863F14225F7B0051CAEC /* frameworks python version */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 7392864E14225F7B0051CAEC /* Build configuration list for PBXAggregateTarget "frameworks python version" */;
+			buildPhases = (
+			);
+			dependencies = (
+				7392864014225F7B0051CAEC /* PBXTargetDependency */,
+				7392870D1422605F0051CAEC /* PBXTargetDependency */,
+				7392864414225F7B0051CAEC /* PBXTargetDependency */,
+				7392864614225F7B0051CAEC /* PBXTargetDependency */,
+				7392864814225F7B0051CAEC /* PBXTargetDependency */,
+				7392864A14225F7B0051CAEC /* PBXTargetDependency */,
+				7392864C14225F7B0051CAEC /* PBXTargetDependency */,
+			);
+			name = "frameworks python version";
+			productName = "lib dynamic";
+		};
+		739286FB142260120051CAEC /* Apps python version */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 73928706142260120051CAEC /* Build configuration list for PBXAggregateTarget "Apps python version" */;
+			buildPhases = (
+			);
+			dependencies = (
+				7392870B142260390051CAEC /* PBXTargetDependency */,
+				739286FE142260120051CAEC /* PBXTargetDependency */,
+				73928700142260120051CAEC /* PBXTargetDependency */,
+				73928702142260120051CAEC /* PBXTargetDependency */,
+				73928704142260120051CAEC /* PBXTargetDependency */,
+			);
+			name = "Apps python version";
+			productName = app;
+		};
 		739A0C0010FA510300D8E4C7 /* Separate tools package */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 739A0C0610FA513500D8E4C7 /* Build configuration list for PBXAggregateTarget "Separate tools package" */;
@@ -839,7 +894,6 @@
 		7332AEC00D8D4C45002BF5FF /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE560D8D491B002BF5FF /* APImage.cpp */; };
 		7332AEC30D8D4C45002BF5FF /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE790D8D491B002BF5FF /* Descriptor.cpp */; };
 		7332AEC40D8D4C45002BF5FF /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7332AE840D8D491C002BF5FF /* HessianDetector.cpp */; };
-		7334FC6513F4156500D89311 /* hugin_python_interface.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
 		733609961247DA6D009225D2 /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
 		733609971247DA6D009225D2 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
 		733609981247DA6D009225D2 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
@@ -936,9 +990,7 @@
 		733EAA29125CD89600658EAF /* icpfind.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
 		733EAA5E125CDA8D00658EAF /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
 		733EF75A13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
-		733EF75B13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
 		733EF75C13FEC51300536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
-		733EF75E13FEC54D00536F16 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
 		734065AA125BA2CA00FC4790 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		734065AB125BA2CA00FC4790 /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
 		734065AC125BA2CA00FC4790 /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
@@ -1207,6 +1259,309 @@
 		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 */; };
+		7392856514225F240051CAEC /* PanoramaMakefilelibExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 73360A0E1247E299009225D2 /* PanoramaMakefilelibExport.h */; };
+		7392856614225F240051CAEC /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
+		7392856714225F240051CAEC /* CalculateCPStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83C90C3A800100E4965E /* CalculateCPStatistics.h */; };
+		7392856814225F240051CAEC /* CalculateMeanExposure.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA84700C3A8AB400E4965E /* CalculateMeanExposure.h */; };
+		7392856914225F240051CAEC /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; };
+		7392856A14225F240051CAEC /* StraightenPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A08D0C3BA90900DD8BD8 /* StraightenPanorama.h */; };
+		7392856B14225F240051CAEC /* PointSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A0900C3BA90900DD8BD8 /* PointSampler.h */; };
+		7392856C14225F240051CAEC /* CalculateOptimalScale.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A1890C3BBF5600DD8BD8 /* CalculateOptimalScale.h */; };
+		7392856D14225F240051CAEC /* CalculateFOV.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A30C0C3BE6DD00DD8BD8 /* CalculateFOV.h */; };
+		7392856E14225F240051CAEC /* CenterHorizontally.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A30E0C3BE6DD00DD8BD8 /* CenterHorizontally.h */; };
+		7392856F14225F240051CAEC /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; };
+		7392857014225F240051CAEC /* NonaFileStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */; };
+		7392857114225F240051CAEC /* ImageGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA40C3FFF820076A417 /* ImageGraph.h */; };
+		7392857214225F240051CAEC /* PTOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA60C3FFF820076A417 /* PTOptimizer.h */; };
+		7392857314225F240051CAEC /* PhotometricOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */; };
+		7392857414225F240051CAEC /* ComputeImageROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 57565A7A0D088F2E00344F55 /* ComputeImageROI.h */; };
+		7392857514225F240051CAEC /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B50C3271640043F754 /* Command.h */; };
+		7392857614225F240051CAEC /* DocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B70C3271640043F754 /* DocumentData.h */; };
+		7392857714225F240051CAEC /* ProgressDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BD0C3271640043F754 /* ProgressDisplay.h */; };
+		7392857814225F240051CAEC /* ProgressDisplayOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BF0C3271640043F754 /* ProgressDisplayOld.h */; };
+		7392857914225F240051CAEC /* ProgressReporterOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9C10C3271640043F754 /* ProgressReporterOld.h */; };
+		7392857A14225F240051CAEC /* CachedImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */; };
+		7392857B14225F240051CAEC /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A90C3FC9750076A417 /* ImageCache.h */; };
+		7392857C14225F240051CAEC /* PanoCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4AA0C3FC9750076A417 /* PanoCommand.h */; };
+		7392857D14225F240051CAEC /* Matrix3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C00C3021B000736343 /* Matrix3.h */; };
+		7392857E14225F240051CAEC /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C10C3021B000736343 /* Vector3.h */; };
+		7392857F14225F240051CAEC /* eig_jacobi.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C30C3021B000736343 /* eig_jacobi.h */; };
+		7392858014225F240051CAEC /* graph.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C50C3021B000736343 /* graph.h */; };
+		7392858114225F240051CAEC /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; };
+		7392858214225F240051CAEC /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; };
+		7392858314225F240051CAEC /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; };
+		7392858414225F240051CAEC /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; };
+		7392858514225F240051CAEC /* ImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 574092350C393E9000D16607 /* ImageRemapper.h */; };
+		7392858614225F240051CAEC /* RemappedPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F420C391052005818A4 /* RemappedPanoImage.h */; };
+		7392858714225F240051CAEC /* SpaceTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F450C391053005818A4 /* SpaceTransform.h */; };
+		7392858814225F240051CAEC /* Stitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 57237F470C391053005818A4 /* Stitcher.h */; };
+		7392858914225F240051CAEC /* ControlPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF260C32B1740043F754 /* ControlPoint.h */; };
+		7392858A14225F240051CAEC /* Lens.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF780C32B69F0043F754 /* Lens.h */; };
+		7392858B14225F240051CAEC /* PanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759DA600C327DC90043F754 /* PanoImage.h */; };
+		7392858C14225F240051CAEC /* Panorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B88E5E0C36CD7E00EC6519 /* Panorama.h */; };
+		7392858D14225F240051CAEC /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; };
+		7392858E14225F240051CAEC /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; };
+		7392858F14225F240051CAEC /* PanoramaVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */; };
+		7392859014225F240051CAEC /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; };
+		7392859114225F240051CAEC /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; };
+		7392859214225F240051CAEC /* PanoToolsInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300700C33D43B00252FE3 /* PanoToolsInterface.h */; };
+		7392859314225F240051CAEC /* PanoToolsOptimizerWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */; };
+		7392859414225F240051CAEC /* Correlation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7230C301FC100736343 /* Correlation.h */; };
+		7392859514225F240051CAEC /* FitPolynom.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7240C301FC100736343 /* FitPolynom.h */; };
+		7392859614225F240051CAEC /* FunctorAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7250C301FC100736343 /* FunctorAccessor.h */; };
+		7392859714225F240051CAEC /* HDRUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7260C301FC100736343 /* HDRUtils.h */; };
+		7392859814225F240051CAEC /* ImageTransforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7270C301FC100736343 /* ImageTransforms.h */; };
+		7392859914225F240051CAEC /* Interpolators.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7280C301FC100736343 /* Interpolators.h */; };
+		7392859A14225F240051CAEC /* MultiLayerImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7290C301FC100736343 /* MultiLayerImage.h */; };
+		7392859B14225F240051CAEC /* MultiThreadOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72B0C301FC100736343 /* MultiThreadOperations.h */; };
+		7392859C14225F240051CAEC /* NearestFeatureTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72C0C301FC100736343 /* NearestFeatureTransform.h */; };
+		7392859D14225F240051CAEC /* Pyramid.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72D0C301FC100736343 /* Pyramid.h */; };
+		7392859E14225F240051CAEC /* ROIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72E0C301FC100736343 /* ROIImage.h */; };
+		7392859F14225F240051CAEC /* RansacParameterEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72F0C301FC100736343 /* RansacParameterEstimator.h */; };
+		739285A014225F240051CAEC /* VigQuotientEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7300C301FC100736343 /* VigQuotientEstimator.h */; };
+		739285A114225F240051CAEC /* VignettingCorrection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7310C301FC100736343 /* VignettingCorrection.h */; };
+		739285A214225F240051CAEC /* blend.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7320C301FC100736343 /* blend.h */; };
+		739285A314225F240051CAEC /* emor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7340C301FC100736343 /* emor.h */; };
+		739285A414225F240051CAEC /* impexalpha.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7350C301FC100736343 /* impexalpha.hxx */; };
+		739285A514225F240051CAEC /* lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7360C301FC100736343 /* lut.h */; };
+		739285A614225F240051CAEC /* pyramid2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7370C301FC100736343 /* pyramid2.h */; };
+		739285A714225F240051CAEC /* ransac.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7380C301FC100736343 /* ransac.h */; };
+		739285A814225F240051CAEC /* tiffUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7390C301FC100736343 /* tiffUtils.h */; };
+		739285A914225F240051CAEC /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F73A0C301FC100736343 /* utils.h */; };
+		739285AA14225F240051CAEC /* PanoToolsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */; };
+		739285AB14225F240051CAEC /* ImageTransformsGPU.h in Headers */ = {isa = PBXBuildFile; fileRef = 73C0DAD81046E9B000CB55B7 /* ImageTransformsGPU.h */; };
+		739285AC14225F240051CAEC /* CalculateOptimalROI.h in Headers */ = {isa = PBXBuildFile; fileRef = 73E488F710D5997300A083C8 /* CalculateOptimalROI.h */; };
+		739285AD14225F240051CAEC /* image_variables.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278310E4A7AE00D3C8CB /* image_variables.h */; };
+		739285AE14225F240051CAEC /* ImageVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278410E4A7AE00D3C8CB /* ImageVariable.h */; };
+		739285AF14225F240051CAEC /* ImageVariableGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278610E4A7AE00D3C8CB /* ImageVariableGroup.h */; };
+		739285B014225F240051CAEC /* ImageVariableTranslate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278710E4A7AE00D3C8CB /* ImageVariableTranslate.h */; };
+		739285B114225F240051CAEC /* StandardImageVariableGroups.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329279B10E4BB5D00D3C8CB /* StandardImageVariableGroups.h */; };
+		739285B214225F240051CAEC /* Mask.h in Headers */ = {isa = PBXBuildFile; fileRef = 738A774A112B4869004E3612 /* Mask.h */; };
+		739285B314225F240051CAEC /* CalculateOverlap.h in Headers */ = {isa = PBXBuildFile; fileRef = 7318CA64119D371100DBD6FD /* CalculateOverlap.h */; };
+		739285B414225F240051CAEC /* AssistantMakefilelibExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 73360A411247E898009225D2 /* AssistantMakefilelibExport.h */; };
+		739285B514225F240051CAEC /* TranslatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 73F54BA0129809A000141773 /* TranslatePanorama.h */; };
+		739285B614225F240051CAEC /* flann_mpi.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 73C5F70F12E212910033A6E1 /* flann_mpi.hpp */; };
+		739285B714225F240051CAEC /* LinesTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DFBC91139B516C00558A2D /* LinesTypes.h */; };
+		739285B814225F240051CAEC /* FindN8Lines.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DFBC92139B516C00558A2D /* FindN8Lines.h */; };
+		739285B914225F240051CAEC /* FindLines.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DFBC94139B516C00558A2D /* FindLines.h */; };
+		739285BA14225F240051CAEC /* alphanum.h in Headers */ = {isa = PBXBuildFile; fileRef = 73FDC9BC13A7D4DC0042030D /* alphanum.h */; };
+		739285BC14225F240051CAEC /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; };
+		739285BD14225F240051CAEC /* CalculateCPStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA83C80C3A800100E4965E /* CalculateCPStatistics.cpp */; };
+		739285BE14225F240051CAEC /* CalculateMeanExposure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA846F0C3A8AB400E4965E /* CalculateMeanExposure.cpp */; };
+		739285BF14225F240051CAEC /* CalculateOptimalScale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A18A0C3BBF5600DD8BD8 /* CalculateOptimalScale.cpp */; };
+		739285C014225F240051CAEC /* CalculateOptimalROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73E488F810D5997300A083C8 /* CalculateOptimalROI.cpp */; };
+		739285C114225F240051CAEC /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; };
+		739285C214225F240051CAEC /* StraightenPanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A08C0C3BA90900DD8BD8 /* StraightenPanorama.cpp */; };
+		739285C314225F240051CAEC /* CalculateOverlap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7318CA65119D371100DBD6FD /* CalculateOverlap.cpp */; };
+		739285C414225F240051CAEC /* CalculateFOV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A30D0C3BE6DD00DD8BD8 /* CalculateFOV.cpp */; };
+		739285C514225F240051CAEC /* CenterHorizontally.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A30B0C3BE6DD00DD8BD8 /* CenterHorizontally.cpp */; };
+		739285C614225F240051CAEC /* FitPanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A39F0C3BED7F00DD8BD8 /* FitPanorama.cpp */; };
+		739285C714225F240051CAEC /* ComputeImageROI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A790D088F2E00344F55 /* ComputeImageROI.cpp */; };
+		739285C814225F240051CAEC /* ImageGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA30C3FFF820076A417 /* ImageGraph.cpp */; };
+		739285C914225F240051CAEC /* PhotometricOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA70C3FFF820076A417 /* PhotometricOptimizer.cpp */; };
+		739285CA14225F240051CAEC /* PTOptimizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EDDA50C3FFF820076A417 /* PTOptimizer.cpp */; };
+		739285CB14225F240051CAEC /* PanoramaMakefilelibExport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73360A0D1247E299009225D2 /* PanoramaMakefilelibExport.cpp */; };
+		739285CC14225F240051CAEC /* AssistantMakefilelibExport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73360A401247E898009225D2 /* AssistantMakefilelibExport.cpp */; };
+		739285CD14225F240051CAEC /* PointSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5785A08F0C3BA90900DD8BD8 /* PointSampler.cpp */; };
+		739285CE14225F240051CAEC /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; };
+		739285CF14225F240051CAEC /* ProgressDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9BC0C3271640043F754 /* ProgressDisplay.cpp */; };
+		739285D014225F240051CAEC /* ProgressDisplayOld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9BE0C3271640043F754 /* ProgressDisplayOld.cpp */; };
+		739285D114225F240051CAEC /* ProgressReporterOld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9C00C3271640043F754 /* ProgressReporterOld.cpp */; };
+		739285D214225F240051CAEC /* CachedImageRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */; };
+		739285D314225F240051CAEC /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A80C3FC9750076A417 /* ImageCache.cpp */; };
+		739285D414225F240051CAEC /* eig_jacobi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C20C3021B000736343 /* eig_jacobi.cpp */; };
+		739285D514225F240051CAEC /* graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C40C3021B000736343 /* graph.cpp */; };
+		739285D614225F240051CAEC /* Matrix3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C487350C313A2C002D79F1 /* Matrix3.cpp */; };
+		739285D714225F240051CAEC /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C486C50C312BA8002D79F1 /* Vector3.cpp */; };
+		739285D814225F240051CAEC /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; };
+		739285D914225F240051CAEC /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709939D0D2E449400499A34 /* platform.cpp */; };
+		739285DA14225F240051CAEC /* SpaceTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F440C391052005818A4 /* SpaceTransform.cpp */; };
+		739285DB14225F240051CAEC /* Stitcher1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F480C391053005818A4 /* Stitcher1.cpp */; };
+		739285DC14225F240051CAEC /* Stitcher2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F490C391053005818A4 /* Stitcher2.cpp */; };
+		739285DD14225F240051CAEC /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; };
+		739285DE14225F240051CAEC /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; };
+		739285DF14225F240051CAEC /* Stitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F460C391053005818A4 /* Stitcher.cpp */; };
+		739285E014225F240051CAEC /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; };
+		739285E114225F240051CAEC /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; };
+		739285E214225F240051CAEC /* Mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A7749112B4869004E3612 /* Mask.cpp */; };
+		739285E314225F240051CAEC /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; };
+		739285E414225F240051CAEC /* PanoramaOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300810C33D49200252FE3 /* PanoramaOptions.cpp */; };
+		739285E514225F240051CAEC /* PanoramaVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EE7B0C32A9FA0043F754 /* PanoramaVariable.cpp */; };
+		739285E614225F240051CAEC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; };
+		739285E714225F240051CAEC /* SrcPanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EEE00C32AE100043F754 /* SrcPanoImage.cpp */; };
+		739285E814225F240051CAEC /* ImageVariableGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */; };
+		739285E914225F240051CAEC /* StandardImageVariableGroups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7329279A10E4BB5D00D3C8CB /* StandardImageVariableGroups.cpp */; };
+		739285EA14225F240051CAEC /* PanoToolsInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */; };
+		739285EB14225F240051CAEC /* PanoToolsOptimizerWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */; };
+		739285EC14225F240051CAEC /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
+		739285ED14225F240051CAEC /* PanoToolsTransformGPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DAD01046E94100CB55B7 /* PanoToolsTransformGPU.cpp */; };
+		739285EE14225F240051CAEC /* emor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7330C301FC100736343 /* emor.cpp */; };
+		739285EF14225F240051CAEC /* MultiThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F72A0C301FC100736343 /* MultiThreadOperations.cpp */; };
+		739285F014225F240051CAEC /* ImageTransformsGPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DAD71046E9B000CB55B7 /* ImageTransformsGPU.cpp */; };
+		739285F114225F240051CAEC /* Comment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E4F9124777380098B385 /* Comment.cpp */; };
+		739285F214225F240051CAEC /* MakefileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E502124777380098B385 /* MakefileItem.cpp */; };
+		739285F314225F240051CAEC /* Variable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E514124777390098B385 /* Variable.cpp */; };
+		739285F414225F240051CAEC /* VariableRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E518124777390098B385 /* VariableRef.cpp */; };
+		739285F514225F240051CAEC /* Makefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E4FF124777380098B385 /* Makefile.cpp */; };
+		739285F614225F240051CAEC /* Rule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E509124777380098B385 /* Rule.cpp */; };
+		739285F714225F240051CAEC /* VariableDef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E516124777390098B385 /* VariableDef.cpp */; };
+		739285F814225F240051CAEC /* AutoVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E4F5124777380098B385 /* AutoVariable.cpp */; };
+		739285F914225F240051CAEC /* Conditional.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E4FB124777380098B385 /* Conditional.cpp */; };
+		739285FA14225F240051CAEC /* Manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E505124777380098B385 /* Manager.cpp */; };
+		739285FB14225F240051CAEC /* Anything.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7357E4F3124777380098B385 /* Anything.cpp */; };
+		739285FC14225F240051CAEC /* TranslatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73F54BA1129809A000141773 /* TranslatePanorama.cpp */; };
+		739285FD14225F240051CAEC /* FindN8Lines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73DFBC93139B516C00558A2D /* FindN8Lines.cpp */; };
+		739285FE14225F240051CAEC /* FindLines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73DFBC95139B516C00558A2D /* FindLines.cpp */; };
+		739285FF14225F240051CAEC /* alphanum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73FDC9BD13A7D4DC0042030D /* alphanum.cpp */; };
+		7392860114225F240051CAEC /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		7392860214225F240051CAEC /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		7392860314225F240051CAEC /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		7392860414225F240051CAEC /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		7392860514225F240051CAEC /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		7392860614225F240051CAEC /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
+		7392860714225F240051CAEC /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		7392860814225F240051CAEC /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
+		7392860914225F240051CAEC /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		7392860A14225F240051CAEC /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
+		7392860B14225F240051CAEC /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		7392860C14225F240051CAEC /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		7392860D14225F240051CAEC /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		7392860E14225F240051CAEC /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		7392860F14225F240051CAEC /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
+		7392861014225F240051CAEC /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
+		7392861114225F240051CAEC /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		7392861214225F240051CAEC /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		7392861314225F240051CAEC /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		7392861414225F240051CAEC /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		7392861514225F240051CAEC /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		7392861614225F240051CAEC /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		7392861714225F240051CAEC /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		7392861814225F240051CAEC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		7392861914225F240051CAEC /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; };
+		7392861A14225F240051CAEC /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98410FB69FC00839DF3 /* libGLEW.dylib */; };
+		7392861B14225F240051CAEC /* libexiv2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98310FB69FC00839DF3 /* libexiv2.dylib */; };
+		7392861C14225F240051CAEC /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
+		7392866014225FDB0051CAEC /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
+		7392866114225FDB0051CAEC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E347610C4A8F7D006AA781 /* config.h */; };
+		7392866214225FDB0051CAEC /* CPDetectorConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 733609841247DA57009225D2 /* CPDetectorConfig.h */; };
+		7392866314225FDB0051CAEC /* PluginItems.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A3B813F58B9200BB58F2 /* PluginItems.h */; };
+		7392866514225FDB0051CAEC /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3314F0C4A8859006AA781 /* huginApp.cpp */; };
+		7392866614225FDB0051CAEC /* CleanCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73D24BB11061592C00B8A25D /* CleanCP.cpp */; };
+		7392866714225FDB0051CAEC /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; };
+		7392866814225FDB0051CAEC /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331120C4A8859006AA781 /* CommandHistory.cpp */; };
+		7392866914225FDB0051CAEC /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */; };
+		7392866A14225FDB0051CAEC /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310C0C4A8859006AA781 /* CPImageCtrl.cpp */; };
+		7392866B14225FDB0051CAEC /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310E0C4A8859006AA781 /* CPListFrame.cpp */; };
+		7392866C14225FDB0051CAEC /* CropPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331140C4A8859006AA781 /* CropPanel.cpp */; };
+		7392866D14225FDB0051CAEC /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331160C4A8859006AA781 /* HFOVDialog.cpp */; };
+		7392866E14225FDB0051CAEC /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311B0C4A8859006AA781 /* ImagesList.cpp */; };
+		7392866F14225FDB0051CAEC /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311D0C4A8859006AA781 /* ImagesPanel.cpp */; };
+		7392867014225FDB0051CAEC /* LensPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311F0C4A8859006AA781 /* LensPanel.cpp */; };
+		7392867114225FDB0051CAEC /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331210C4A8859006AA781 /* LocalizedFileTipProvider.cpp */; };
+		7392867214225FDB0051CAEC /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331230C4A8859006AA781 /* MainFrame.cpp */; };
+		7392867314225FDB0051CAEC /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */; };
+		7392867414225FDB0051CAEC /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */; };
+		7392867514225FDB0051CAEC /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331360C4A8859006AA781 /* PanoPanel.cpp */; };
+		7392867614225FDB0051CAEC /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */; };
+		7392867714225FDB0051CAEC /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */; };
+		7392867814225FDB0051CAEC /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313E0C4A8859006AA781 /* PreviewPanel.cpp */; };
+		7392867914225FDB0051CAEC /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331430C4A8859006AA781 /* TextKillFocusHandler.cpp */; };
+		7392867A14225FDB0051CAEC /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3316A0C4A8859006AA781 /* wxPanoCommand.cpp */; };
+		7392867B14225FDB0051CAEC /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA370EB3A20500CD7122 /* ChoosyRemapper.cpp */; };
+		7392867C14225FDB0051CAEC /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA390EB3A20500CD7122 /* GLPreviewFrame.cpp */; };
+		7392867D14225FDB0051CAEC /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3B0EB3A20500CD7122 /* GLRenderer.cpp */; };
+		7392867E14225FDB0051CAEC /* GLViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3D0EB3A20500CD7122 /* GLViewer.cpp */; };
+		7392867F14225FDB0051CAEC /* MeshManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA3F0EB3A20500CD7122 /* MeshManager.cpp */; };
+		7392868014225FDB0051CAEC /* MeshRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA410EB3A20500CD7122 /* MeshRemapper.cpp */; };
+		7392868114225FDB0051CAEC /* OutputProjectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA430EB3A20500CD7122 /* OutputProjectionInfo.cpp */; };
+		7392868214225FDB0051CAEC /* PreviewCropTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA450EB3A20500CD7122 /* PreviewCropTool.cpp */; };
+		7392868314225FDB0051CAEC /* PreviewDifferenceTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA470EB3A20500CD7122 /* PreviewDifferenceTool.cpp */; };
+		7392868414225FDB0051CAEC /* PreviewIdentifyTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4B0EB3A20500CD7122 /* PreviewIdentifyTool.cpp */; };
+		7392868514225FDB0051CAEC /* PreviewPanoMaskTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA4D0EB3A20500CD7122 /* PreviewPanoMaskTool.cpp */; };
+		7392868614225FDB0051CAEC /* TexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA530EB3A20500CD7122 /* TexCoordRemapper.cpp */; };
+		7392868714225FDB0051CAEC /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA550EB3A20500CD7122 /* TextureManager.cpp */; };
+		7392868814225FDB0051CAEC /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA570EB3A20500CD7122 /* VertexCoordRemapper.cpp */; };
+		7392868914225FDB0051CAEC /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA590EB3A20500CD7122 /* ViewState.cpp */; };
+		7392868A14225FDB0051CAEC /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 734FBA830EB3A40300CD7122 /* NonaOptionsDialog.cpp */; };
+		7392868B14225FDB0051CAEC /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57D5093A0F5942F200CCDCB5 /* CPImagesComboBox.cpp */; };
+		7392868C14225FDB0051CAEC /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7388EAFB0F6BFB1B001E08FA /* ResetDialog.cpp */; };
+		7392868D14225FDB0051CAEC /* PreviewControlPointTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DC6B104715E500CB55B7 /* PreviewControlPointTool.cpp */; };
+		7392868E14225FDB0051CAEC /* GreatCircles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73C0DC6E104715E500CB55B7 /* GreatCircles.cpp */; };
+		7392868F14225FDB0051CAEC /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73411F131077B205001831AF /* HDRMergeOptionDialog.cpp */; };
+		7392869014225FDB0051CAEC /* NumTransDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7368E4631083ABF200519ED0 /* NumTransDialog.cpp */; };
+		7392869114225FDB0051CAEC /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738C044910A0A5D90061D144 /* AboutDialog.cpp */; };
+		7392869214225FDB0051CAEC /* LayoutRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 732927AB10E4C15700D3C8CB /* LayoutRemapper.cpp */; };
+		7392869314225FDB0051CAEC /* PreviewLayoutLinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 732927AD10E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp */; };
+		7392869414225FDB0051CAEC /* MaskEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */; };
+		7392869514225FDB0051CAEC /* MaskImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */; };
+		7392869614225FDB0051CAEC /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; };
+		7392869714225FDB0051CAEC /* CPDetectorDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7340668D125BB2AF00FC4790 /* CPDetectorDialog.cpp */; };
+		7392869814225FDB0051CAEC /* ToolHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739C2E5B12DA4FE1006C4F77 /* ToolHelper.cpp */; };
+		7392869914225FDB0051CAEC /* Tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739C2E5D12DA4FE1006C4F77 /* Tool.cpp */; };
+		7392869A14225FDB0051CAEC /* OverviewOutlinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739C2E6512DA503C006C4F77 /* OverviewOutlinesTool.cpp */; };
+		7392869B14225FDB0051CAEC /* OverviewCameraTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739C2E6912DA503C006C4F77 /* OverviewCameraTool.cpp */; };
+		7392869C14225FDB0051CAEC /* ProjectionGridTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 739C2E8812DA50E1006C4F77 /* ProjectionGridTool.cpp */; };
+		7392869D14225FDB0051CAEC /* DragTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73FFFC0112DB83D10053B190 /* DragTool.cpp */; };
+		7392869E14225FDB0051CAEC /* PanosphereSphereTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 733AC12C131AFE1600D276B9 /* PanosphereSphereTool.cpp */; };
+		7392869F14225FDB0051CAEC /* PreviewColorPickerTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 733AC12D131AFE1600D276B9 /* PreviewColorPickerTool.cpp */; };
+		739286A014225FDB0051CAEC /* HtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 733AC12E131AFE1600D276B9 /* HtmlWindow.cpp */; };
+		739286A114225FDB0051CAEC /* PluginItems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73A8A3BB13F58BDF00BB58F2 /* PluginItems.cpp */; };
+		739286A314225FDB0051CAEC /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD5813A6B041006A3C54 /* Python.framework */; };
+		739286A414225FDB0051CAEC /* hugin_python_interface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
+		739286A514225FDB0051CAEC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; };
+		739286A614225FDB0051CAEC /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
+		739286A714225FDB0051CAEC /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; };
+		739286A814225FDB0051CAEC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
+		739286A914225FDB0051CAEC /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; };
+		739286AA14225FDB0051CAEC /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
+		739286AB14225FDB0051CAEC /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
+		739286AC14225FDB0051CAEC /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
+		739286AD14225FDB0051CAEC /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
+		739286AE14225FDB0051CAEC /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		739286AF14225FDB0051CAEC /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
+		739286B014225FDB0051CAEC /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
+		739286B114225FDB0051CAEC /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
+		739286B214225FDB0051CAEC /* libImath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.dylib */; };
+		739286B314225FDB0051CAEC /* libHalf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.dylib */; };
+		739286B414225FDB0051CAEC /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
+		739286B514225FDB0051CAEC /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73360A161247E32E009225D2 /* libboost_date_time.dylib */; };
+		739286B614225FDB0051CAEC /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7DD3310FCA0AF00839DF3 /* libboost_filesystem.dylib */; };
+		739286B714225FDB0051CAEC /* libboost_iostreams.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03A1247A87C0062CF12 /* libboost_iostreams.dylib */; };
+		739286B814225FDB0051CAEC /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB03C1247AB3A0062CF12 /* libboost_regex.dylib */; };
+		739286B914225FDB0051CAEC /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
+		739286BA14225FDB0051CAEC /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 734BB02B1247A37A0062CF12 /* libboost_system.dylib */; };
+		739286BB14225FDB0051CAEC /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5731C4920D5532D400605D22 /* libexpat.dylib */; };
+		739286BC14225FDB0051CAEC /* HuginVigraImpex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739286BD14225FDB0051CAEC /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739286BE14225FDB0051CAEC /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
+		739286BF14225FDB0051CAEC /* icpfind.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		739286C014225FDB0051CAEC /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
+		739286C114225FDB0051CAEC /* libwx_macu_gl-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F84780EC754CC004771D6 /* libwx_macu_gl-2.8.dylib */; };
+		739286C214225FDB0051CAEC /* libhugin_celeste.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D50ADB0F596DB700CCDCB5 /* libhugin_celeste.a */; };
+		739286C314225FDB0051CAEC /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E864E2C510CE8437007AC6E4 /* liblcms.dylib */; };
+		739286C414225FDB0051CAEC /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98410FB69FC00839DF3 /* libGLEW.dylib */; };
+		739286C514225FDB0051CAEC /* libexiv2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98310FB69FC00839DF3 /* libexiv2.dylib */; };
+		739286C614225FDB0051CAEC /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 735F091612DF6F300081D893 /* AGL.framework */; };
+		739286C714225FDB0051CAEC /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733EF75913FEC51300536F16 /* Python.framework */; };
+		739286C914225FDB0051CAEC /* hugin_python_interface.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
+		739286CA14225FDB0051CAEC /* flann_cpp.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73C5F7A412E2DC490033A6E1 /* flann_cpp.framework */; };
+		739286CB14225FDB0051CAEC /* icpfind.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
+		739286CC14225FDB0051CAEC /* localfeatures.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 733467E91183644D00401093 /* localfeatures.framework */; };
+		739286CD14225FDB0051CAEC /* HuginVigraImpex.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5769FE380D24CFEC00A6AD01 /* HuginVigraImpex.framework */; };
+		739286CE14225FDB0051CAEC /* HuginBase.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
+		739286CF14225FDB0051CAEC /* HuginBaseWx.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
+		739286D114225FDB0051CAEC /* align_image_stack in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73E79F300D674EAC00C07126 /* align_image_stack */; };
+		739286D214225FDB0051CAEC /* autooptimiser in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = E8A7D9AF10FB6F5A00839DF3 /* autooptimiser */; };
+		739286D314225FDB0051CAEC /* celeste_standalone in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73EBC0900EC9E0B20068B821 /* celeste_standalone */; };
+		739286D414225FDB0051CAEC /* cpclean in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73D24B4E106152CD00B8A25D /* cpclean */; };
+		739286D514225FDB0051CAEC /* cpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7309D40B125B9893007D4719 /* cpfind */; };
+		739286D614225FDB0051CAEC /* icpfind in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 73A95ECE124888EB0076D3FB /* icpfind */; };
+		739286D714225FDB0051CAEC /* pano_modify in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 733DF63F117F2268002EC787 /* pano_modify */; };
+		739286D814225FDB0051CAEC /* checkpto in Copy Executable Files */ = {isa = PBXBuildFile; fileRef = 7396E4601269806E0096D1B3 /* checkpto */; };
+		739286DA14225FDB0051CAEC /* PTBatcherGui.icns in Resources */ = {isa = PBXBuildFile; fileRef = 731DBF1A129D846500793A38 /* PTBatcherGui.icns */; };
+		739286DB14225FDB0051CAEC /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 737E48DA11D3F8C6002BA8AE /* HuginStitchProject.app */; };
+		739286DC14225FDB0051CAEC /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 731DBF01129D835200793A38 /* Hugin.icns */; };
+		739286DD14225FDB0051CAEC /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 731DBF02129D835200793A38 /* HuginFiles.icns */; };
 		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 */; };
 		7396E44D1269806E0096D1B3 /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
@@ -1340,7 +1695,6 @@
 		73A8A35913F5709500BB58F2 /* hsi_SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A35513F5709500BB58F2 /* hsi_SrcPanoImage.h */; };
 		73A8A3B913F58B9200BB58F2 /* PluginItems.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A8A3B813F58B9200BB58F2 /* PluginItems.h */; };
 		73A8A3BC13F58BDF00BB58F2 /* PluginItems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73A8A3BB13F58BDF00BB58F2 /* PluginItems.cpp */; };
-		73A8A7C613F598D500BB58F2 /* hugin_python_interface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
 		73A8A7DA13F5A23800BB58F2 /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; };
 		73A95EE412488A2A0076D3FB /* HuginBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900AA0D24D29300A6AD01 /* HuginBase.framework */; };
 		73A95EE512488A2A0076D3FB /* HuginBaseWx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 576900E10D24D32C00A6AD01 /* HuginBaseWx.framework */; };
@@ -1396,7 +1750,6 @@
 		73B3F8E713F6A27F001E557D /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E8A7D98410FB69FC00839DF3 /* libGLEW.dylib */; };
 		73B3F8E813F6A27F001E557D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
 		73B3F91813F6A358001E557D /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0DBA51046EAC700CB55B7 /* GLUT.framework */; };
-		73B6022613FD874700B56CE1 /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD5813A6B041006A3C54 /* Python.framework */; };
 		73BB093D0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
 		73BB093E0FACC71200B04997 /* PanoToolsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BB093C0FACC71200B04997 /* PanoToolsUtils.h */; };
 		73BB093F0FACC71200B04997 /* PanoToolsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73BB093B0FACC71200B04997 /* PanoToolsUtils.cpp */; };
@@ -1445,6 +1798,7 @@
 		73CA10271296FD4900A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
 		73CA10281296FD5800A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
 		73CA10291296FD6900A4BC75 /* libboost_signals.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA0FFB1296FB9500A4BC75 /* libboost_signals.dylib */; };
+		73CAEC5814227A090064D5E8 /* hugin_python_interface.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; };
 		73CE4996124A667F001F0F42 /* icpfind.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7336099F1247DA6D009225D2 /* icpfind.framework */; };
 		73D24B69106155D700B8A25D /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73D24B641061556700B8A25D /* AGL.framework */; };
 		73D24B6A106155D700B8A25D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 739F846B0EC75402004771D6 /* OpenGL.framework */; };
@@ -2471,181 +2825,335 @@
 			remoteGlobalIDString = 73EBC08F0EC9E0B20068B821;
 			remoteInfo = "celeste dynamic";
 		};
-		7354FD6113F3FAD7005940D0 /* PBXContainerItemProxy */ = {
+		73573E2D10F9EEA300CF0ECD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		73573E2F10F9EEA300CF0ECD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		7359F1A11269F71B00D3291B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7396E4441269806E0096D1B3;
+			remoteInfo = checkpto;
+		};
+		7359F21C126A188000D3291B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 57D382C50E2369D000445A37;
+			remoteInfo = "tools - other dynamic";
+		};
+		7364217610763A44000121C5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		7364217810763A4A000121C5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		736421F7107640F7000121C5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7364216F10763A22000121C5;
+			remoteInfo = deghosting_mask;
+		};
+		7377C7061064170B002EF919 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FE370D24CFEC00A6AD01;
+			remoteInfo = "vigra_impex Framework";
+		};
+		7377C70810641712002EF919 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 576900A90D24D29300A6AD01;
+			remoteInfo = "hugin_base Framework";
+		};
+		737E48B011D3F8C6002BA8AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5769FC280D24A26400A6AD01;
+			remoteInfo = frameworks;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e30c5a054704
changeset:  5586:e30c5a054704
user:       tmodes
date:       Mon Sep 19 17:36:18 2011 +0200
description:

Merged

diffstat:

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

diffs (57 lines):

diff -r 2984706eed15 -r e30c5a054704 doc/linefind.pod
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/linefind.pod	Mon Sep 19 17:36:18 2011 +0200
@@ -0,0 +1,53 @@
+=head1 NAME
+
+linefind - Detect vertical features in images
+
+=head1 SYNOPSIS
+
+B<linefind> [options] -o I<output.pto> I<input.pto>
+
+=head1 DESCRIPTION
+
+B<linefind> is a detector for vertical features in images. It tries to find
+vertical lines using the same algorithm as Calibrate_lens_gui and assigns
+vertical control points to them. The detection runs on the source images, if
+the input images are rectilinear images. In the other cases (e. g. fisheye
+images) the input images are reprojected to an equirectangular projection and
+the detection works on the reprojected images. It using the roll value, saved
+in the pto project file, to determine what is "top" and "bottom". So before
+running linefind check that your roll values are correct (E. g. when using
+images straight from the camera, use a roll value of 0 for landscape and a
+value of 90 or 270 for portrait images. If your camera has an orientation
+sensor, Hugin can detect this information automatically and sets the roll
+value accordingly when adding such images into Hugin.
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o|--output> output.pto
+
+Output Hugin PTO file. Default: '<filename>_line.pto'.
+
+=item B<-l|--lines> num
+
+The maximum number of lines added per image (default: 5) Attention: Keep in
+mind that more vertical control points will dominate the optimisation in favour
+of "normal" control points.
+
+=item B<-i|--image> num
+
+Image number(s) to process.  Normally linefind tries to find vertical lines in
+all images of the project file. If you want to limit the detection to some
+selected images, you can use this parameter. Can be used multiple times.
+
+=item B<-h|--help>
+
+shows help
+
+=back
+
+=head1 AUTHORS
+
+Thomas Modes, line detection code based on L<calibrate_lens> by Tim Nugent
+

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e89e11a13a52
changeset:  5631:e89e11a13a52
user:       tmodes
date:       Fri Oct 21 23:22:00 2011 +0200
description:

Merged

diffstat:

 src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html                    |    6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html     |  136 +++++++--
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html                 |    7 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html |    4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html                  |   10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Makefile                       |   18 +
 6 files changed, 141 insertions(+), 40 deletions(-)

diffs (297 lines):

diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html	Fri Oct 21 23:20:06 2011 +0200
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html	Fri Oct 21 23:22:00 2011 +0200
@@ -122,13 +122,13 @@
 </p><p>--ransacdist &lt;int&gt;            Ransac: homography estimation distance threshold (pixels) (default: 25)
 </p><p>--ransacmode &lt;string&gt;        Select the mode used in the ransac step. Possible values: auto, hom, rpy, rpyv, rpyb (default: auto)
 </p>
-<ul><li> hom: Assume a homography. Only applicable for non-wide angle views. Uses the original panomatic code. It is also more flexible than required and can generate false matches, particlarly if most of the matches are located on a single line.
+<ul><li> hom: Assume a homography. Only applicable for non-wide angle views. Uses the original panomatic code. It is also more flexible than required and can generate false matches, particularly if most of the matches are located on a single line.
 </li></ul>
-<ul><li> rpy: Align images using roll, pitch and yaw. This requires a good estimate for the horizontal field of view (and distortion, for  heavily distorted images). It is the prefered mode if a calibrated lens is used, or the HFOV could be read successfully from the EXIF data.
+<ul><li> rpy: Align images using roll, pitch and yaw. This requires a good estimate for the horizontal field of view (and distortion, for  heavily distorted images). It is the preferred mode if a calibrated lens is used, or the HFOV could be read successfully from the EXIF data.
 </li></ul>
 <ul><li> rpyv: Align pair by optimizing roll, pitch, yaw and field of view. Should work without prior knowledge of the field of view, but might fail more often, due to error function used in the panotools optimizer, it tends to shrink the fov to 0.
 </li></ul>
-<ul><li> rpyvb: Align pair by optimizing roll, pitch, yaw, field of view and the "b" distortion parameter.  Probaby very fragile, just implemented for testing.
+<ul><li> rpyvb: Align pair by optimizing roll, pitch, yaw, field of view and the "b" distortion parameter.  Probably very fragile, just implemented for testing.
 </li></ul>
 <ul><li> auto: Use homography for images with hfov &lt; 65 degrees and rpy otherwise.
 </li></ul>
diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html	Fri Oct 21 23:20:06 2011 +0200
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html	Fri Oct 21 23:22:00 2011 +0200
@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta name="generator" content="MediaWiki 1.14.0" />
-		<meta name="keywords" content="Hugin Batch Processor,Hugin" />
+		<meta name="keywords" content="Hugin Batch Processor,Hugin,Hugin Assistant tab,Hugin Parameters for Control Point Detectors dialog,Hugin Preferences" />
 		
 		
 		
@@ -44,55 +44,135 @@
 			
 												<!-- start content -->
 			<p>Batch Processor is a component of <a href="Hugin.html" title="Hugin">hugin</a> that provides functionality to stitch multiple projects in a batch queue. Its goal is to make stitching of multiple projects faster. The process of stitching multiple projects is simplified using a queue of projects. User can add/edit/delete projects in the queue.
+The Batch Processor can also queue the creation of the final project. In this case it runs the same steps as in the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a>.
 </p><p><b>Hugin Batch Processor</b> consists of a list of projects. Projects in the list are ordered in sequential order. By default, the list is reinstated every time you open the application. What is more, entire queue of projects can be saved and reopened later using buttons Clear Batch, Open Batch, Save Batch.
+</p><p>There are 2 interfaces to the queue: <b>PTBatcher</b> provides a command line interface and <b>PTBatcherGUI</b> provides a graphical user interface. 
 </p>
-<a name="Installation" id="Installation"></a><h1> <span class="mw-headline"> Installation </span></h1>
-<p>At least on MacOS you have to download and install the BatchProcessor separately. You will find it at the Sourceforge page<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/">[*]</a> inside the lastest version, e.g. here<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2010.4/ptbatchergui-mac-2010.4.0.dmg/download">[*]</a>. Just copy the app into the same folder as hugin and run it.
+
+<a name="Installation_on_Mac_OS_X" id="Installation_on_Mac_OS_X"></a><h1> <span class="mw-headline"> Installation on Mac OS X </span></h1>
+<p>At least on Mac OS X you have to download and install the BatchProcessor separately. You will find it at the Sourceforge page<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/">[*]</a> inside the folder for the latest version, e.g. ptbatchergui-mac-2011.0.0.dmg<a class="external" href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0/ptbatchergui-mac-2011.0.0.dmg/download">[*]</a>. Just copy the app into the same folder as hugin and run it.
 </p>
 <a name="Usage" id="Usage"></a><h1> <span class="mw-headline"> Usage </span></h1>
-<p>Just create several project files (do everything and just skip the export step), load them in the batch processor and start the process. This way you can run several large project unattended. The output filename will be the same as the projects name (xyz.pto -&gt; xyz.tif) in the same folder.
-</p><p>At least on MacOS there are some minor things to pay attention to:
-</p><p>You should only add the project files you want to process by using the "add project" (see below) or the menu "File - Add Project". Be aware that you will not be able to delete or deactivate a single project from the list - you will have to clean up the whole list using the menu "File - Clean List". If you want to process all projects inside a folder, just use the "folder search" (see below). Apart from this, all works fine. 
+<p>Just create several project files (do everything and just skip the export step), load them in the batch processor and start the process. This way you can run several large projects unattended. The output file name will be the same as the name of the corresponding project file (xyz.pto -&gt; xyz.tif) and is saved in the same folder.
+</p><p>At least on Mac OS X there are some minor issues to pay attention to (This should be fixed in 2011.1, rev. 43043d2742e4):
+</p>
+<ul><li> You should only add the project files you want to process by using the "add project" (see below) or the menu "File - Add Project". Be aware that you will not be able to delete or deactivate a single project from the list - you will have to clean up the whole list using the menu "File - Clean List".<br />If you want to process all projects inside a folder, just use the "folder search" (see below). 
+</li><li> Some older entries in PTBatcherGUI's list view (those with status "File missing") may not be removable by clicking the 'minus' symbol or the "Remove complete" button.<br />To remove those just close PTBatcherGui, open it again and immediately select one of the missing pto files and start deleting them using the 'minus' symbol. As an alternative, use the button "Remove completed"  on the right side which will remove all completed projects in one go.
+</li></ul>
+<p><br />
+Apart from this, all works fine.
 </p>
 <a name="Flag_options" id="Flag_options"></a><h1> <span class="mw-headline"> Flag options </span></h1>
 <p>Batch process is also influenced by the following check boxes:
 </p>
 <ul><li> <b>parallel execution</b>: Execute stitching of projects in the list parallel rather than in sequential order. Check this only if you are certain your computer is up for the task of stitching multiple projects at the same time.
-</li><li> <b>delete .pto files</b>: After stitching of each projects ends, Batch Processor will delete the project file of the currently processed project. Be careful, deleted files are lost!
 </li><li> <b>overwrite always</b>: Always(for each project) overwrite output filename if it exists. Otherwise, you will get a dialog box whether you want to overwrite files or not.
 </li><li> <b>Shutdown when done</b>: Turn off computer when batch process ends.
+</li><li> <b>Remove finished projects</b>: If checked successful finished projects will be automatic removed from the queue. Otherwise the items remains in the queue and the user is responsible for the queue management.
+</li><li> <b>Automatic stitch after assistant</b>: If checked successful detected projects (projects in the assistant queue) will be added the stitching queue and will therefore automatically stitched.
 </li></ul>
-<a name="Buttons" id="Buttons"></a><h1> <span class="mw-headline"> Buttons </span></h1>
-<a name="Clear_batch" id="Clear_batch"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_clear_batch.png" src="Hugin_clear_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_clear_batch.png">[*]</a> Clear batch </span></h2>
-<p>Removes all projects from the list.
+<a name="Functions" id="Functions"></a><h1> <span class="mw-headline"> Functions </span></h1>
+<a name="Queue_management" id="Queue_management"></a><h2> <span class="mw-headline"> Queue management </span></h2>
+<p>The management of the queue can done by the appropriate menu items or by the corresponding toolbar buttons.
 </p>
-<a name="Open_batch" id="Open_batch"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_open_batch.png" src="Hugin_open_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_open_batch.png">[*]</a> Open batch </span></h2>
-<p>Open a batch file with a list of projects that was saved earlier.
+<ul><li> Add project files to queue
+</li><li> Remove project file from queue (you need to select the project file in the list)
+</li><li> The complete queue list can be saved and loaded from disc (The current active list is automatically saved at the end. You don't need to save it explicitly.)
+</li><li> The complete list can be cleared.
+</li></ul>
+<a name="Item_management" id="Item_management"></a><h2> <span class="mw-headline"> Item management </span></h2>
+<p>The single items in the queue can be modified by the buttons on the right side of the window
 </p>
-<a name="Save_batch" id="Save_batch"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_save_batch.png" src="Hugin_save_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_save_batch.png">[*]</a> Save batch </span></h2>
-<p>Save current list of projects to a file. File can later be opened using the Open batch button
+<ul><li> <b>Remove complete</b> will remove all items form the queue which were successfully finished.
+</li><li> <b>Change prefix</b> will change the output prefix. This is only possible if the item is in the stitching queue. It does not work for items in the assistant queue.
+</li><li> <b>Reset project</b>/<b>Reset all</b> resets the status of the selected project/all projects to default value. This allows to execute the stitching again.
+</li><li> <b>Edit with Hugin</b> opens the selected in Hugin to modify it.
+</li><li> The order of the items can be change with <b>Move project up</b> and <b>Move project down</b>
+</li><li> You can also add an arbitrary command to the queue with <b>Add application</b>. 
+</li></ul>
+<a name="Executing_queue" id="Executing_queue"></a><h2> <span class="mw-headline"> Executing queue </span></h2>
+<p>The queue can be started, paused/resumed and stopped with the toolbar buttons.
+You can also skip one project.
 </p>
-<a name="Start" id="Start"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_start_batch.png" src="Hugin_start_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_start_batch.png">[*]</a> Start </span></h2>
-<p>Starts the batch process and stitches all projects in the queue.
+<a name="Automation" id="Automation"></a><h2> <span class="mw-headline"> Automation </span></h2>
+<p>PTBatcherGUI provides some more features for automation. This can be accessed by File-&gt;Search directory for.
 </p>
-<a name="Skip" id="Skip"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_skip_batch.png" src="Hugin_skip_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_skip_batch.png">[*]</a> Skip </span></h2>
-<p>Stops stitching of current project in batch process and starts stitching next project in the queue. This button is inactive when batch process is not running.
+<a name="Existing_project_files" id="Existing_project_files"></a><h3> <span class="mw-headline"> Existing project files </span></h3>
+<p>With File-&gt;Search directory for...-&gt;Projects you can search recursively in the given folder for (existing) project files and appends them to (stitching) queue.
 </p>
-<a name="Pause" id="Pause"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_pause_batch.png" src="Hugin_pause_batch.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_pause_batch.png">[*]</a> Pause </span></h2>
-<p>Pauses the current batch process. In order to continue the process press the Start button. This button is inactive when batch process is not running.
+<a name="New_project_files" id="New_project_files"></a><h3> <span class="mw-headline"> New project files </span></h3>
+<p>First select a folder in which should be searched. After pressing start is searches for image files in the folder (and optionally its sub folders). It uses the information stored in the EXIF data to decide which images could belong to a panorama. This works only in one folder level, it does not match images in different folders. (It uses camera maker, camera model, focal length, image size and date/time for this decision.) 
+</p><p>After the search has finished it shows a list of the found panoramas. With <b>Send selected panoramas to queue</b> the project files are created and send to the assistant queue. You can deselect individual panoramas from this processing step by untick the panorama.
+</p><p>The project files are named with the selected name scheme
 </p>
-<a name="Cancel" id="Cancel"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_cancel_batch.png" src="Hugin_cancel_batch.png" width="22" height="22" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_cancel_batch.png">[*]</a> Cancel </span></h2>
-<p>Stops batch execution. This button is active only when batch process is running.
+<ul><li> PanoramaXX.pto: This will generate project files: panorama0.pto, panorama1.pto,...
+</li><li> First file - last file.pto: The project files will by named by the first and last image of the panorama.
+</li><li> Foldername.pto: In this case the project file is named like the containing folder.
+</li></ul>
+<p>Existing project files will not be overwritten, instead it appends an increasing number.
+</p><p>If the images are shoot with auto bracketing it tries to generate the appropriate stacks. In this case check that you default control point generator setting is one which works with stacks (check <a href="Hugin_Preferences.html#Control_Point_Detectors" title="Hugin Preferences">Preferences in Hugin</a> and <a href="Hugin_Parameters_for_Control_Point_Detectors_dialog.html" title="Hugin Parameters for Control Point Detectors dialog">control point detector parameters</a>).
+If you shoot from a tripod then you can select also <b>Create links</b>. This will link the positions of all images of one stack. If you deselect this option, it will create the stacks but will not link the positions of the images (e.g. when shooting free hand).
 </p>
-<a name="Add_project" id="Add_project"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_add_project.png" src="Hugin_add_project.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_add_project.png">[*]</a> Add project </span></h2>
-<p>Adds projects to the list. A file browser appears where users can select one or multiple .pto or .pts files.
+<a name="Command_line_switches" id="Command_line_switches"></a><h1> <span class="mw-headline"> Command line switches </span></h1>
+<a name="PTBatcherGUI" id="PTBatcherGUI"></a><h2> <span class="mw-headline"> PTBatcherGUI </span></h2>
+<p>To add a project to the (stitching) queue use
 </p>
-<a name="Remove_project" id="Remove_project"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_remove_project.png" src="Hugin_remove_project.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_remove_project.png">[*]</a> Remove project </span></h2>
-<p>Removes selected project from the list.
+<pre>   PTBatcherGUI project.pto output_prefix
+</pre>
+<p>on Mac OS X use
 </p>
-<a name="Folder_search" id="Folder_search"></a><h2> <span class="mw-headline"> <img alt="Image:Hugin_folder_search.png" src="Hugin_folder_search.png" width="32" height="32" border="0" /><a class="external" href="http://wiki.panotools.org/File:Hugin_folder_search.png">[*]</a> Folder search </span></h2>
-<p>Recursively searches given folder for project files and appends them to project list.
+<pre>   open PTBatcherGui.app --args project.pto output_prefix
+</pre>
+<p><br />
+</p><p>You can also add several projects
 </p>
+<pre>   PTBatcherGUI project1.pto prefix1 project2.pto prefix2
+</pre>
+<p>on Mac OS X use
+</p>
+<pre>   open PTBatcherGui.app --args project1.pto prefix1 project2.pto prefix2
+</pre>
+<p><br />
+The prefix is optionally. If you don't provide a prefix, the filename (without extension) of the project file is used as prefix.
+</p><p><br />
+You can also add a project to the assistant queue.
+</p>
+<pre>   PTBatcherGUI --assistant project.pto
+</pre>
+<p>and on Mac OS X
+</p>
+<pre>   open PTBatcherGui.app --args --assistant project.pto
+</pre>
+<p>Some of the above described options can be accessed also by command line switches:
+</p>
+<ul><li>  <code> /h, --help </code>           show this help message
+</li><li>  <code> /b, --batch </code>          run batch immediately
+</li><li>  <code> /p, --parallel </code>       run batch projects in parallel
+</li><li>  <code> /d, --delete </code>         delete *.pto files after stitching
+</li><li>  <code> /o, --overwrite </code>      overwrite previous files without asking
+</li><li>  <code> /s, --shutdown </code>       shutdown computer after batch is complete
+</li><li>  <code>/v, --verbose </code>        show verbose output when processing projects
+</li></ul>
+<p>Please keep in mind that only one instance of PTBatcherGUI can run at one time. Starting PTBatcherGUI a second time with command line switches will influence the already running instance and not start a second instance with own options.
+</p>
+<a name="PTBatcher" id="PTBatcher"></a><h2> <span class="mw-headline"> PTBatcher </span></h2>
+<p>PTBatcher provides a very similar interface compared to the GUI version. It works with the same list that is used by the GUI version.
+Attention: Only the short names of the switches are recognized.
+</p>
+<ul><li>  <code>-a file</code> add project to queue. Unless -o option is present, the default prefix is appointed.
+</li><li>  <code>-o</code> output prefix (together with -a option)
+</li><li>  <code>-l</code> list all projects in batch queue
+</li><li>  <code>-c</code> clear all projects from batch queue
+</li><li>  <code>-x id</code> remove project with specified id
+</li><li>  <code>-r</code> reset all projects to waiting status
+</li><li>  <code>-b</code> start batch process
+</li><li>  <code>-p</code> use parallel processing (together with -b option)
+</li><li>  <code>-d</code> delete .pto files when complete (together with -b option)
+</li><li>  <code>-s</code> shutdown computer when complete (together with -b option)
+</li><li>  <code>-v</code> verbose mode
+</li><li>  <code>-h</code> print this
+</li></ul>
+
 
 
 
diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html	Fri Oct 21 23:20:06 2011 +0200
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html	Fri Oct 21 23:22:00 2011 +0200
@@ -188,7 +188,7 @@
 </th><th> &gt;
 </th><th> and the space character.
 </th></tr></table>
-<p>Hugin currently does not do plausibility checks on the paths and file names that are given to it. It relies on the operating system's conventions and limitations. However Hugin uses make to run the stitching process, and make has more restrictive limitation than the operating system.
+<p>Hugin currently does not do plausibility checks on the paths and file names that are given to it. It relies on the operating system's conventions and limitations. However Hugin uses make<a class="external" href="http://en.wikipedia.org/wiki/Make_%28software%29">[*]</a> to run the stitching process, and make has more restrictive limitations than the operating system.
 </p><p>Please don't use the above characters in your files and folders when you want to make sure they work with Hugin. If you absolutely need files named this way, rename them after processing. Do not file bug reports based on filenames with the above characters. The issue<a class="external" href="https://sourceforge.net/tracker/?func=detail&amp;atid=550441&amp;aid=2883450&amp;group_id=77506">[*]</a> is known, analyzed, and may be fixed in the future.
 </p>
 <a name="Stitch_fails_when_.27.26.27_is_part_of_the_Windows_7_user-name" id="Stitch_fails_when_.27.26.27_is_part_of_the_Windows_7_user-name"></a><h3> <span class="mw-headline"> Stitch fails when '&amp;' is part of the Windows 7 <i>user-name</i> </span></h3>
@@ -214,6 +214,11 @@
 <p>Can I restart a stitching process that was interrupted manually or by an error without starting everything from scratch?
 </p><p>Unfortunately the Hugin Makefile system only supports restarting if you stitch on the command-line.  The GUI tools always create new temporary .pto project and Makefile files every time they stitch, so this forces make to recreate everything for every stitch.
 </p>
+<a name="Patching_nadir_shots_using_XYZ_mosaic_mode_cuts_the_photos_in_half" id="Patching_nadir_shots_using_XYZ_mosaic_mode_cuts_the_photos_in_half"></a><h3> <span class="mw-headline"> Patching nadir shots using XYZ mosaic mode cuts the photos in half </span></h3>
+<p>"If an image is mapped to the <a href="Nadir.html" title="Nadir">nadir</a> of a panorama and all translation parameters (X,Y,Z) are set to zero, the image is properly mapped and covers the entire nadir of the shot. However, if any of the X,Y,Z parameters are non-zero, then the image is cut in half and only occupies half of the nadir."
+</p><p>Basically the XYZ mosaic mode as it is implemented currently in <a href="Hugin.html" title="Hugin">Hugin</a> requires that the mosaic photos must be mapped to a plane perpendicular to the view direction - In practice this means that what you are trying to do only works if the panorama is rotated such that the nadir is in the middle of the canvas and not at the bottom.
+</p><p>This isn't so bad, the nadir-in-the-middle image looks a bit weird, you can just reload the stitched <a href="Equirectangular_Projection.html" title="Equirectangular Projection">equirectangular Projection</a> result into a new single-photo project and straighten it there.
+</p>
 <a name="Python_Scripting" id="Python_Scripting"></a><h2> <span class="mw-headline"> Python Scripting </span></h2>
 <a name="What_is_Python_Scripting.3F" id="What_is_Python_Scripting.3F"></a><h3> <span class="mw-headline"> What is Python Scripting? </span></h3>
 <p>Python is a powerful scripting language.  Starting with Hugin 2011.2, Hugin exposes the panorama object through hsi.py in Python.  It must be explicitly activated at build time with the CMake boolean parameter -DBUILD_HSI:BOOL=ON.  It is currently untested / unavailable on OSX.
diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html	Fri Oct 21 23:20:06 2011 +0200
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html	Fri Oct 21 23:22:00 2011 +0200
@@ -116,7 +116,7 @@
 		<!-- end of the left (by default at least) column -->
 			
 			<div id="footer">
-				<dpanotoolsng.png);" href="/Main_Page" title="Visit the main page [z]" accesskey="z"></a>
+				panotoolsng.png);" href="/Main_Page" title="Visit the main page [z]" accesskey="z"></a>
 	</div>
 	
 	
@@ -132,4 +132,4 @@
 
 
 
-<!-- Served in 0.163 secs. --></body></html>
+<!-- Served in 0.167 secs. --></body></html>
diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html	Fri Oct 21 23:20:06 2011 +0200
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html	Fri Oct 21 23:22:00 2011 +0200
@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta name="generator" content="MediaWiki 1.14.0" />
-		<meta name="keywords" content="Linefind,Calibrate lens gui,Control points,Hugin,Roll,Vertical control points" />
+		<meta name="keywords" content="Linefind,Calibrate lens gui,Control points,Equirectangular Projection,Fisheye Projection,Hugin,Rectilinear Projection,Roll,Vertical control points" />
 		
 		
 		
@@ -44,8 +44,8 @@
 			
 												<!-- start content -->
 			<a name="General_and_description" id="General_and_description"></a><h1> <span class="mw-headline"> General and description </span></h1>
-<p><b>Linefind</b> is a detector for vertical features in images. It tries to find vertical lines using the same algorithm as <a href="Calibrate_lens_gui.html#Line_detection" title="Calibrate lens gui">Calibrate_lens_gui</a> and assign <a href="Vertical_control_points.html" title="Vertical control points">vertical control points</a> to them.
-It using the <a href="Roll.html" title="Roll">roll value</a>, saved in the pto project file, to determine what is "top" and "bottom". So before running <b>linefind</b> check that your <a href="Roll.html" title="Roll">roll values</a> are correct (E.g. when using images straight from the camera, use a roll value of 0 for landscape and a value of 90 or 270 for portrait images. If your camera has an orientation sensor, <a href="Hugin.html" title="Hugin">Hugin</a> can detection this information automatically and sets the roll value accordingly when adding such images into Hugin.
+<p><b>Linefind</b> is a detector for vertical features in images. It tries to find vertical lines using the same algorithm as <a href="Calibrate_lens_gui.html#Line_detection" title="Calibrate lens gui">Calibrate_lens_gui</a> and assigns <a href="Vertical_control_points.html" title="Vertical control points">vertical control points</a> to them. The detection runs on the source images, if the input images are <a href="Rectilinear_Projection.html" title="Rectilinear Projection">rectilinear images</a>. In the other cases (e. g. <a href="Fisheye_Projection.html" title="Fisheye Projection">fisheye images</a>) the input images are reprojected to an <a href="Equirectangular_Projection.html" title="Equirectangular Projection">equirectangular projection</a> and the detection works on the reprojected images.
+It uses the <a href="Roll.html" title="Roll">roll value</a>, saved in the pto project file, to determine what is "top" and "bottom". So before running <b>linefind</b> check that your <a href="Roll.html" title="Roll">roll values</a> are correct (E. g. when using images straight from the camera, use a roll value of 0 for landscape and a value of 90 or 270 for portrait images. If your camera has an orientation sensor, <a href="Hugin.html" title="Hugin">Hugin</a> can detect this information automatically and sets the roll value accordingly when adding such images into Hugin.
 </p>
 <a name="Usage" id="Usage"></a><h1> <span class="mw-headline"> Usage </span></h1>
 <p>The general usage is
@@ -77,8 +77,6 @@
 		</div>
 		<!-- end of the left (by default at least) column -->
 			
-			<!-- end of the left (by default at least) column -->
-			
 			
 </div>
 
@@ -86,4 +84,4 @@
 
 
 
-<!-- Served in 0.202 secs. --></body></html>
+<!-- Served in 0.141 secs. --></body></html>
diff -r 64ecc4140629 -r e89e11a13a52 src/hugin1/hugin/xrc/data/help_en_EN/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Makefile	Fri Oct 21 23:22:00 2011 +0200
@@ -0,0 +1,18 @@
+# downloads a selection of pages specified in the 'pages.txt' file from the
+# Panotools wiki at http://wiki.panotools.org/ and assembles them into an
+# offline HTML manual for Hugin.
+#
+# Requires wget and perl
+#
+# Bruno Postle <bruno@...>
+
+all: fetch dewiki
+
+fetch: pages.txt
+	sh fetch.sh
+
+dewiki:
+	perl dewiki.pl *.html
+
+.PHONY: fetch dewiki
+

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a1ed14aecce8
changeset:  5645:a1ed14aecce8
user:       tmodes
date:       Sun Nov 06 08:39:41 2011 +0100
description:

Merged

diffstat:

 src/translations/da.po |  4533 ++++++++++++++++++++++++++++-------------------
 1 files changed, 2733 insertions(+), 1800 deletions(-)

diffs (truncated from 7611 to 500 lines):

diff -r 79b821a5c341 -r a1ed14aecce8 src/translations/da.po
--- a/src/translations/da.po	Sun Nov 06 08:38:36 2011 +0100
+++ b/src/translations/da.po	Sun Nov 06 08:39:41 2011 +0100
@@ -8,7 +8,7 @@
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2011-10-21 22:38+0200\n"
-"PO-Revision-Date: 2011-08-26 16:36+0100\n"
+"PO-Revision-Date: 2011-11-05 20:43+0100\n"
 "Last-Translator: Thomas Pryds <thomas@..."
 "Language-Team: danish <da@..."
 "Language: \n"
@@ -16,66 +16,86 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
 #, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i "
-"stedet versionen i programpakken"
-
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i stedet versionen i programpakken"
+
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
 #: hugin1/calibrate_lens/LensCalFrame.cpp:99
 #: hugin1/calibrate_lens/LensCalFrame.cpp:398
 #: hugin1/calibrate_lens/LensCalFrame.cpp:462
-#: hugin1/hugin/AssistantPanel.cpp:365 hugin1/hugin/AssistantPanel.cpp:433
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/AssistantPanel.cpp:491
-#: hugin1/hugin/AssistantPanel.cpp:503 hugin1/hugin/AssistantPanel.cpp:509
-#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:153
-#: hugin1/hugin/GLViewer.cpp:163 hugin1/hugin/LensPanel.cpp:809
-#: hugin1/hugin/MainFrame.cpp:149 hugin1/hugin/MainFrame.cpp:714
-#: hugin1/hugin/MainFrame.cpp:994 hugin1/hugin/MainFrame.cpp:1521
+#: hugin1/hugin/AssistantPanel.cpp:365
+#: hugin1/hugin/AssistantPanel.cpp:433
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/AssistantPanel.cpp:503
+#: hugin1/hugin/AssistantPanel.cpp:509
+#: hugin1/hugin/CPEditorPanel.cpp:1783
+#: hugin1/hugin/GLViewer.cpp:153
+#: hugin1/hugin/GLViewer.cpp:163
+#: hugin1/hugin/LensPanel.cpp:809
+#: hugin1/hugin/MainFrame.cpp:149
+#: hugin1/hugin/MainFrame.cpp:714
+#: hugin1/hugin/MainFrame.cpp:994
+#: hugin1/hugin/MainFrame.cpp:1521
 #: hugin1/hugin/MainFrame.cpp:2018
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:993 hugin1/hugin/PanoPanel.cpp:1056
-#: hugin1/hugin/PanoPanel.cpp:1184 hugin1/hugin/PanoPanel.cpp:1202
+#: hugin1/hugin/PanoPanel.cpp:993
+#: hugin1/hugin/PanoPanel.cpp:1056
+#: hugin1/hugin/PanoPanel.cpp:1184
+#: hugin1/hugin/PanoPanel.cpp:1202
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:206
-#: hugin1/ptbatcher/BatchFrame.cpp:455 hugin1/ptbatcher/FindPanoDialog.cpp:274
+#: hugin1/ptbatcher/BatchFrame.cpp:455
+#: hugin1/ptbatcher/FindPanoDialog.cpp:274
 #: hugin1/ptbatcher/ProjectListBox.cpp:169
 #: hugin1/stitch_project/hugin_stitch_project.cpp:411
 msgid "Error"
 msgstr "Fejl"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1202
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/PanoPanel.cpp:1202
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Eksternt program %s blev ikke fundet i programpakken; bruger i stedet "
-"systemsti"
-
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+msgstr "Eksternt program %s blev ikke fundet i programpakken; bruger i stedet systemsti"
+
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
 #, c-format
 msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Programmet %s blev ikke fundet i indstillingerne, bruger i stedet "
-"standardværdi"
-
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
-#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
-#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
-#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
+msgstr "Programmet %s blev ikke fundet i indstillingerne, bruger i stedet standardværdi"
+
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:219
+#: hugin1/base_wx/huginConfig.cpp:224
+#: hugin1/base_wx/huginConfig.cpp:230
+#: hugin1/base_wx/huginConfig.cpp:235
+#: hugin1/base_wx/huginConfig.cpp:240
+#: hugin1/base_wx/huginConfig.cpp:245
 #: hugin1/base_wx/huginConfig.cpp:253
 #: hugin1/calibrate_lens/LensCalFrame.cpp:411
 #: hugin1/calibrate_lens/LensCalFrame.cpp:590
@@ -85,54 +105,70 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:736
 #: hugin1/calibrate_lens/LensCalFrame.cpp:770
 #: hugin1/calibrate_lens/LensCalFrame.cpp:842
-#: hugin1/hugin/AssistantPanel.cpp:437 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1385 hugin1/hugin/GLPreviewFrame.cpp:1392
-#: hugin1/hugin/GLPreviewFrame.cpp:1399 hugin1/hugin/GLPreviewFrame.cpp:1413
-#: hugin1/hugin/GLPreviewFrame.cpp:1420 hugin1/hugin/GLPreviewFrame.cpp:1427
-#: hugin1/hugin/MainFrame.cpp:710 hugin1/hugin/MainFrame.cpp:1744
-#: hugin1/hugin/MaskEditorPanel.cpp:448 hugin1/hugin/PreferencesDialog.cpp:934
+#: hugin1/hugin/AssistantPanel.cpp:437
+#: hugin1/hugin/CPDetectorDialog.cpp:121
+#: hugin1/hugin/GLPreviewFrame.cpp:1385
+#: hugin1/hugin/GLPreviewFrame.cpp:1392
+#: hugin1/hugin/GLPreviewFrame.cpp:1399
+#: hugin1/hugin/GLPreviewFrame.cpp:1413
+#: hugin1/hugin/GLPreviewFrame.cpp:1420
+#: hugin1/hugin/GLPreviewFrame.cpp:1427
+#: hugin1/hugin/MainFrame.cpp:710
+#: hugin1/hugin/MainFrame.cpp:1744
+#: hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:934
 #: hugin1/ptbatcher/FindPanoDialog.cpp:231
 #: hugin1/ptbatcher/FindPanoDialog.cpp:252
 msgid "Warning"
 msgstr "Advarsel"
 
-#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:573
+#: hugin1/base_wx/LensTools.cpp:37
+#: hugin1/hugin/ImagesList.cpp:573
 msgid "Normal (rectilinear)"
 msgstr "Normal (retliniet)"
 
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:574
+#: hugin1/base_wx/LensTools.cpp:38
+#: hugin1/hugin/ImagesList.cpp:574
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramisk (cylindrisk)"
 
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:575
+#: hugin1/base_wx/LensTools.cpp:39
+#: hugin1/hugin/ImagesList.cpp:575
 msgid "Circular fisheye"
 msgstr "Cirkulær fisheye"
 
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesList.cpp:576
+#: hugin1/base_wx/LensTools.cpp:40
+#: hugin1/hugin/ImagesList.cpp:576
 msgid "Full frame fisheye"
 msgstr "Full frame fisheye"
 
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1288
-#: hugin1/hugin/ImagesList.cpp:577 hugin1/hugin/PreviewFrame.cpp:618
+#: hugin1/base_wx/LensTools.cpp:41
+#: hugin1/hugin/GLPreviewFrame.cpp:1288
+#: hugin1/hugin/ImagesList.cpp:577
+#: hugin1/hugin/PreviewFrame.cpp:618
 msgid "Equirectangular"
 msgstr "Ækvirektangulært"
 
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:578
+#: hugin1/base_wx/LensTools.cpp:42
+#: hugin1/hugin/ImagesList.cpp:578
 #: hugin1/hugin/PanoPanel.cpp:157
 msgid "Orthographic"
 msgstr "Ortografisk"
 
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:579
+#: hugin1/base_wx/LensTools.cpp:43
+#: hugin1/hugin/ImagesList.cpp:579
 #: hugin1/hugin/PanoPanel.cpp:147
 msgid "Stereographic"
 msgstr "Stereografisk"
 
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:580
+#: hugin1/base_wx/LensTools.cpp:44
+#: hugin1/hugin/ImagesList.cpp:580
 #: hugin1/hugin/PanoPanel.cpp:158
 msgid "Equisolid"
 msgstr "Ækvisolid"
 
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesList.cpp:581
+#: hugin1/base_wx/LensTools.cpp:45
+#: hugin1/hugin/ImagesList.cpp:581
 msgid "Fisheye Thoby"
 msgstr "Fisheye Thoby"
 
@@ -173,11 +209,24 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:33
-#: translations/xrc.cpp:159 translations/xrc.cpp:492 translations/xrc.cpp:562
-#: translations/xrc.cpp:566 translations/xrc.cpp:570 translations/xrc.cpp:662
-#: translations/xrc.cpp:809 translations/xrc.cpp:1008 xrc.cpp:33 xrc.cpp:159
-#: xrc.cpp:492 xrc.cpp:562 xrc.cpp:566 xrc.cpp:570 xrc.cpp:662 xrc.cpp:809
+#: hugin1/stitch_project/hugin_stitch_project.cpp:126
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:159
+#: translations/xrc.cpp:492
+#: translations/xrc.cpp:562
+#: translations/xrc.cpp:566
+#: translations/xrc.cpp:570
+#: translations/xrc.cpp:662
+#: translations/xrc.cpp:809
+#: translations/xrc.cpp:1008
+#: xrc.cpp:33
+#: xrc.cpp:159
+#: xrc.cpp:492
+#: xrc.cpp:562
+#: xrc.cpp:566
+#: xrc.cpp:570
+#: xrc.cpp:662
+#: xrc.cpp:809
 #: xrc.cpp:1008
 msgid "Cancel"
 msgstr "Annullér"
@@ -195,41 +244,40 @@
 msgstr "Optimerer Panorama"
 
 #: hugin1/base_wx/platform.h:40
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*."
-"hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
-
-#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68
-#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:810 xrc.cpp:810
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*.hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
+
+#: hugin1/base_wx/PTWXDlg.cpp:49
+#: hugin1/base_wx/PTWXDlg.cpp:68
+#: hugin1/base_wx/PTWXDlg.cpp:122
+#: translations/xrc.cpp:810
+#: xrc.cpp:810
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304
+#: hugin1/base_wx/RunStitchPanel.cpp:135
+#: hugin1/base_wx/RunStitchPanel.cpp:304
 msgid "Could not open project file:"
 msgstr "Kunne ikke åbne projektfil:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
-#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
+#: hugin1/base_wx/RunStitchPanel.cpp:145
+#: hugin1/base_wx/RunStitchPanel.cpp:312
+#: hugin1/nona_gui/nona_gui.cpp:243
+#: hugin1/ptbatcher/ProjectArray.cpp:88
 #, c-format
 msgid "could not open script : %s"
 msgstr "kunne ikke åbne script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
-#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
+#: hugin1/base_wx/RunStitchPanel.cpp:166
+#: hugin1/base_wx/RunStitchPanel.cpp:320
+#: hugin1/nona_gui/nona_gui.cpp:250
+#: hugin1/ptbatcher/ProjectArray.cpp:115
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "fejl under tolkning af panotools script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
+#: hugin1/base_wx/RunStitchPanel.cpp:210
+#: hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
 msgid "Could not create temporary file"
 msgstr "Kunne ikke oprette midlertidig fil"
@@ -260,7 +308,8 @@
 "Fejl under sammenføjning af projekt\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293
+#: hugin1/base_wx/RunStitchPanel.cpp:287
+#: hugin1/base_wx/RunStitchPanel.cpp:293
 #: hugin1/stitch_project/hugin_stitch_project.cpp:177
 msgid "Error during stitching"
 msgstr "Fejl under sammenføjning"
@@ -274,32 +323,40 @@
 "Fejl under kørsel af assistent\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374
+#: hugin1/base_wx/RunStitchPanel.cpp:366
+#: hugin1/base_wx/RunStitchPanel.cpp:374
 msgid "Error during running assistant"
 msgstr "Fejl under kørsel af assistent"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:62 hugin1/hugin/huginApp.cpp:179
+#: hugin1/calibrate_lens/LensCalApp.cpp:62
+#: hugin1/hugin/huginApp.cpp:179
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:76
 msgid "xrc directory not found in bundle"
 msgstr "xrc-mappe blev ikke fundet i programpakke"
 
 #: hugin1/calibrate_lens/LensCalApp.cpp:62
 #: hugin1/calibrate_lens/LensCalApp.cpp:70
-#: hugin1/calibrate_lens/LensCalApp.cpp:81 hugin1/hugin/huginApp.cpp:179
-#: hugin1/hugin/huginApp.cpp:191 hugin1/hugin/huginApp.cpp:204
-#: hugin1/hugin/MainFrame.cpp:2013 hugin1/ptbatcher/PTBatcherGUI.cpp:76
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:86 hugin1/ptbatcher/PTBatcherGUI.cpp:107
+#: hugin1/calibrate_lens/LensCalApp.cpp:81
+#: hugin1/hugin/huginApp.cpp:179
+#: hugin1/hugin/huginApp.cpp:191
+#: hugin1/hugin/huginApp.cpp:204
+#: hugin1/hugin/MainFrame.cpp:2013
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:76
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:86
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:107
 #: hugin1/stitch_project/hugin_stitch_project.cpp:306
 msgid "Fatal Error"
 msgstr "Fatal fejl"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:70 hugin1/hugin/huginApp.cpp:191
+#: hugin1/calibrate_lens/LensCalApp.cpp:70
+#: hugin1/hugin/huginApp.cpp:191
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:86
 #: hugin1/stitch_project/hugin_stitch_project.cpp:306
 msgid "Translations not found in bundle"
 msgstr "Oversættelser blev ikke fundet i programpakke"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:81 hugin1/hugin/huginApp.cpp:204
+#: hugin1/calibrate_lens/LensCalApp.cpp:81
+#: hugin1/hugin/huginApp.cpp:204
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:107
 msgid ""
 "xrc directory not found, hugin needs to be properly installed\n"
@@ -309,13 +366,13 @@
 "Prøvede sti:"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:98
-#: hugin1/calibrate_lens/LensCalFrame.cpp:461 hugin1/hugin/MainFrame.cpp:148
+#: hugin1/calibrate_lens/LensCalFrame.cpp:461
+#: hugin1/hugin/MainFrame.cpp:148
 #: hugin1/hugin/MainFrame.cpp:993
 #, c-format
 msgid ""
 "The filename(s) contains one of the following invalid characters: %s\n"
-"Hugin can not work with these filenames. Please rename your file(s) and try "
-"again."
+"Hugin can not work with these filenames. Please rename your file(s) and try again."
 msgstr ""
 "Filnavnet (navnene) indeholder et af de følgende ugyldige tegn: %s\n"
 "Hugin kan ikke arbejde med disse filnavne. Omdøb filen(erne) og prøv igen."
@@ -331,29 +388,27 @@
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:397
 #, c-format
-msgid ""
-"The size of the images (%s) does not match with the already added image(s)."
-msgstr ""
-"Størrelsen på billederne (%s) matcher ikke med de(t) allerede tilføjede "
-"billede(r)."
+msgid "The size of the images (%s) does not match with the already added image(s)."
+msgstr "Størrelsen på billederne (%s) matcher ikke med de(t) allerede tilføjede billede(r)."
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:410
 #, c-format
 msgid ""
-"The EXIF information of the added images (%s) are not consistent with the "
-"already added image(s).\n"
+"The EXIF information of the added images (%s) are not consistent with the already added image(s).\n"
 "Please check the image again, if you selected the correct images."
 msgstr ""
-"EXIF-informationen for de tilføjede billeder (%s) svarer ikke overens med de"
-"(t) allerede tilføjede billede(r).\n"
+"EXIF-informationen for de tilføjede billeder (%s) svarer ikke overens med de(t) allerede tilføjede billede(r).\n"
 "Check billedet igen, hvis du har valgt de korrekte filer."
 
-#: hugin1/calibrate_lens/LensCalFrame.cpp:419 hugin1/hugin/MainFrame.cpp:928
-#: hugin1/hugin/wxPanoCommand.cpp:415 hugin1/hugin/wxPanoCommand.cpp:594
+#: hugin1/calibrate_lens/LensCalFrame.cpp:419
+#: hugin1/hugin/MainFrame.cpp:928
+#: hugin1/hugin/wxPanoCommand.cpp:415
+#: hugin1/hugin/wxPanoCommand.cpp:594
 msgid "Add images"
 msgstr "Tilføj billeder"
 
-#: hugin1/calibrate_lens/LensCalFrame.cpp:484 hugin1/hugin/MainFrame.cpp:980
+#: hugin1/calibrate_lens/LensCalFrame.cpp:484
+#: hugin1/hugin/MainFrame.cpp:980
 msgid "Add Image: cancel"
 msgstr "Tilføj billede: annullér"
 
@@ -391,12 +446,10 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:621
 msgid ""
 "There are no detected lines.\n"
-"Please run \"Find lines\" before. If there are no lines found, change the "
-"parameters."
+"Please run \"Find lines\" before. If there are no lines found, change the parameters."
 msgstr ""
 "Der er ikke fundet nogen linier.\n"
-"Kør venligst \"Find linier\" først. Hvis der ikke blev fundet nogen linier, "
-"ændr da parametrene."
+"Kør venligst \"Find linier\" først. Hvis der ikke blev fundet nogen linier, ændr da parametrene."
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:705
 msgid "Optimizing lens distortions parameters..."
@@ -405,39 +458,44 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:736
 msgid ""
 "There are no detected lines.\n"
-"Please run \"Find lines\" and \"Optimize\" before saving the lens data. If "
-"there are no lines found, change the parameters."
+"Please run \"Find lines\" and \"Optimize\" before saving the lens data. If there are no lines found, change the parameters."
 msgstr ""
 "Der er ikke fundet nogen linier.\n"
-"Kør venligst \"Find linier\" og \" Optimér\" før du gemmer objektivdata. "
-"Hvis der ikke blev fundet nogen linier, ændr da parametrene."
-
-#: hugin1/calibrate_lens/LensCalFrame.cpp:741 hugin1/hugin/LensPanel.cpp:763
+"Kør venligst \"Find linier\" og \" Optimér\" før du gemmer objektivdata. Hvis der ikke blev fundet nogen linier, ændr da parametrene."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:741
+#: hugin1/hugin/LensPanel.cpp:763
 msgid "Save lens parameters file"
 msgstr "Gem fil med objektivparametre"
 
-#: hugin1/calibrate_lens/LensCalFrame.cpp:743 hugin1/hugin/LensPanel.cpp:765
+#: hugin1/calibrate_lens/LensCalFrame.cpp:743
+#: hugin1/hugin/LensPanel.cpp:765
 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
 msgstr "Objektivprojektfil (*.ini)|*.ini|Alle filer (*)|*"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:754
-#: hugin1/calibrate_lens/LensCalFrame.cpp:785 hugin1/hugin/MainFrame.cpp:739
+#: hugin1/calibrate_lens/LensCalFrame.cpp:785
+#: hugin1/hugin/MainFrame.cpp:739
 #: hugin1/hugin/MaskEditorPanel.cpp:359
 #, c-format
 msgid "File %s exists. Overwrite?"
 msgstr "Filen %s eksisterer. Overskriv?"
 
 #: hugin1/calibrate_lens/LensCalFrame.cpp:755
-#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:740
-#: translations/xrc.cpp:428 xrc.cpp:428
+#: hugin1/calibrate_lens/LensCalFrame.cpp:786
+#: hugin1/hugin/MainFrame.cpp:740
+#: translations/xrc.cpp:428
+#: xrc.cpp:428
 msgid "Save project"
 msgstr "Gem projekt"
 
-#: hugin1/calibrate_lens/LensCalFrame.cpp:774 hugin1/hugin/MainFrame.cpp:727
+#: hugin1/calibrate_lens/LensCalFrame.cpp:774
+#: hugin1/hugin/MainFrame.cpp:727