Hugin

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

Modified Files:
	PanoToolsInterface.cpp SpaceTransform.cpp 
Log Message:
bugfix: new transform code code assumed e=d.
bugfix: fixed crash when rectangular crop lies outside of input image


Index: SpaceTransform.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/SpaceTransform.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SpaceTransform.cpp	5 Feb 2006 14:39:40 -0000	1.6
+++ SpaceTransform.cpp	21 Feb 2006 23:12:45 -0000	1.7
@@ -418,8 +418,8 @@
 	r = sqrt( x_dest*x_dest + y_dest*y_dest );
 	theta 	= r / params.distance;
 
-    if( theta >= PI /2.0 )
-    	rho = 1.6e16 ;
+    if( theta >= PI /2.0 )
+    	rho = 1.6e16 ;
     else if( theta == 0.0 )
 		rho = 1.0;
 	else
@@ -895,7 +895,7 @@
     mpscale[1]		= mpscale[0];
     mpshear[0]		= img / imheight; // TODO : im->cP.shear_x / imheight;
     mpshear[1]		= imt / imwidth; // TODO : im->cP.shear_y / imwidth;
-    mprot[0]		= mpdistance * PI;								// 180¡ in screenpoints
+    mprot[0]		= mpdistance * PI;								// 180 in screenpoints
     mprot[1]		= -imyaw *  mpdistance * PI / 180.0; 			//    rotation angle in screenpoints
 
     // add radial correction
@@ -1118,7 +1118,7 @@
 	}
 	*/
 
-    mprot[0]	= mpdistance * PI;								// 180¡ in screenpoints
+    mprot[0]	= mpdistance * PI;								// 180 in screenpoints
     mprot[1]	= imyaw *  mpdistance * PI / 180.0; 			//    rotation angle in screenpoints
 
     //mp->perspect[0] = (void*)(mp->mt);
@@ -1204,7 +1204,7 @@
     vars.insert(make_pair(std::string("b"), PT::Variable("b", src.getRadialDistortion()[1])));
     vars.insert(make_pair(std::string("c"), PT::Variable("c", src.getRadialDistortion()[2])));
     vars.insert(make_pair(std::string("d"), PT::Variable("d", src.getRadialDistortionCenterShift().x)));
-    vars.insert(make_pair(std::string("e"), PT::Variable("e", src.getRadialDistortionCenterShift().x)));
+    vars.insert(make_pair(std::string("e"), PT::Variable("e", src.getRadialDistortionCenterShift().y)));
     vars.insert(make_pair(std::string("g"), PT::Variable("g", src.getShear().x)));
     vars.insert(make_pair(std::string("t"), PT::Variable("t", src.getShear().y)));
 

Index: PanoToolsInterface.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoToolsInterface.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PanoToolsInterface.cpp	5 Feb 2006 14:39:40 -0000	1.22
+++ PanoToolsInterface.cpp	21 Feb 2006 23:12:45 -0000	1.23
@@ -279,7 +279,7 @@
     vars.insert(make_pair(std::string("b"), PT::Variable("b", src.getRadialDistortion()[1])));
     vars.insert(make_pair(std::string("c"), PT::Variable("c", src.getRadialDistortion()[2])));
     vars.insert(make_pair(std::string("d"), PT::Variable("d", src.getRadialDistortionCenterShift().x)));
-    vars.insert(make_pair(std::string("e"), PT::Variable("e", src.getRadialDistortionCenterShift().x)));
+    vars.insert(make_pair(std::string("e"), PT::Variable("e", src.getRadialDistortionCenterShift().y)));
     vars.insert(make_pair(std::string("g"), PT::Variable("g", src.getShear().x)));
     vars.insert(make_pair(std::string("t"), PT::Variable("t", src.getShear().y)));