1 files changed, 26 insertions, 20 deletions
diff --git a/graphics/panomatic/files/patch-panomatic-main.cpp b/graphics/panomatic/files/patch-panomatic-main.cpp
index f25f34dc29ea..2cf9c17b49f3 100644
--- a/graphics/panomatic/files/patch-panomatic-main.cpp
+++ b/graphics/panomatic/files/patch-panomatic-main.cpp
@@ -1,22 +1,28 @@
---- panomatic/main.cpp.orig	2008-03-10 21:19:09.000000000 +0100
-+++ panomatic/main.cpp	2008-04-26 20:26:30.000000000 +0200
+--- panomatic/main.cpp.orig	2008-03-10 20:19:09.000000000 +0000
++++ panomatic/main.cpp	2012-09-24 12:02:46.529117189 +0000
 @@ -92,6 +92,7 @@
- 		MyOutput my;
- 		cmd.setOutput(&my);
- 		
+ 		MyOutput my;
+ 		cmd.setOutput(&my);
+ 		
 +		ValueArg<float> aArgScale("","scale", "Scale image with factor to detect keypoints    (default:0.5)\n", false, 0.5, "float");
- 		SwitchArg aArgFullScale("","fullscale", "Uses full scale image to detect keypoints    (default:false)\n", false);
- 		SwitchArg aArgSurfExtended("","surf128", "Uses extended SURF (128 descriptors)    (default:true)", true);
- 		ValueArg<int> aArgSurfScoreThreshold("","surfscore", "SURF Detection score threshold    (default : 1000)\n", false, 1000, "int");
-@@ -175,8 +176,9 @@
- 		if (aArgSieve2Size.isSet())			ioPanoDetector.setSieve2Size(aArgSieve2Size.getValue());
- 		if (aArgLinearMatch.isSet())		ioPanoDetector.setLinearMatch(aArgLinearMatch.getValue());
- 		if (aArgLinearMatchLen.isSet())		ioPanoDetector.setLinearMatchLen(aArgLinearMatchLen.getValue());
--        if (aArgFullScale.isSet())          ioPanoDetector.setDownscale(false);
--            
-+        if (aArgFullScale.isSet())          ioPanoDetector.setScale(1.);
-+            if (aArgScale.isSet())          ioPanoDetector.setScale(aArgScale.getValue());
-+
- 		if (aArgTest.isSet())				ioPanoDetector.setTest(aArgTest.getValue());
- 		if (aArgCores.isSet())				ioPanoDetector.setCores(aArgCores.getValue());
- 
+ 		SwitchArg aArgFullScale("","fullscale", "Uses full scale image to detect keypoints    (default:false)\n", false);
+ 		SwitchArg aArgSurfExtended("","surf128", "Uses extended SURF (128 descriptors)    (default:true)", true);
+ 		ValueArg<int> aArgSurfScoreThreshold("","surfscore", "SURF Detection score threshold    (default : 1000)\n", false, 1000, "int");
+@@ -130,6 +131,7 @@
+ 		cmd.add(aArgSurfScoreThreshold);		
+ 		cmd.add(aArgSurfExtended);
+ 		cmd.add(aArgFullScale);
++		cmd.add(aArgScale);
+ 		
+ 		//cmd.add( aArgSurfExtended );
+ 
+@@ -175,7 +177,8 @@
+ 		if (aArgSieve2Size.isSet())			ioPanoDetector.setSieve2Size(aArgSieve2Size.getValue());
+ 		if (aArgLinearMatch.isSet())		ioPanoDetector.setLinearMatch(aArgLinearMatch.getValue());
+ 		if (aArgLinearMatchLen.isSet())		ioPanoDetector.setLinearMatchLen(aArgLinearMatchLen.getValue());
+-        if (aArgFullScale.isSet())          ioPanoDetector.setDownscale(false);
++        if (aArgFullScale.isSet())          ioPanoDetector.setScale(1.);
++        if (aArgScale.isSet())          ioPanoDetector.setScale(aArgScale.getValue());
+             
+ 		if (aArgTest.isSet())				ioPanoDetector.setTest(aArgTest.getValue());
+ 		if (aArgCores.isSet())				ioPanoDetector.setCores(aArgCores.getValue());