[GRASS-SVN] r44476 - grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify

[svn_grass at osgeo.org]

Author: mmetz
Date: 2010-11-29 00:09:26 -0800 (Mon, 29 Nov 2010)
New Revision: 44476

Modified:
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/equ.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/get_wind.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/rectify.c
Log:
adapt to ortholib

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/equ.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/equ.c	2010-11-29 08:08:42 UTC (rev 44475)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/equ.c	2010-11-29 08:09:26 UTC (rev 44476)
@@ -39,7 +39,9 @@
 							&group.ZC,
 							&group.omega,
 							&group.phi,
-							&group.kappa);
+							&group.kappa,
+							&group.M,
+							&group.MI);
 
     return 0;
 }

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/get_wind.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/get_wind.c	2010-11-29 08:08:42 UTC (rev 44475)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/get_wind.c	2010-11-29 08:09:26 UTC (rev 44476)
@@ -74,8 +74,7 @@
 
     I_georef(w1->west, w1->north, &e0, &n0, group.E12, group.N12);
     I_inverse_ortho_ref(e0, n0, aver_z, &e, &n, &z1, &group.camera_ref,
-			group.XC, group.YC, group.ZC, group.omega, group.phi,
-			group.kappa);
+			group.XC, group.YC, group.ZC, group.MI);
 
     G_debug(1, "NORTH WEST CORNER");
     G_debug(1, "group.E12 = %f %f %f,", group.E12[0], group.E12[1],
@@ -93,8 +92,7 @@
 
     I_georef(w1->east, w1->north, &e0, &n0, group.E12, group.N12);
     I_inverse_ortho_ref(e0, n0, aver_z, &e, &n, &z1, &group.camera_ref,
-			group.XC, group.YC, group.ZC, group.omega, group.phi,
-			group.kappa);
+			group.XC, group.YC, group.ZC, group.MI);
 
     G_debug(1, "NORTH EAST CORNER");
     G_debug(1, "image  x = %f y = %f, photo x = %f y = %f", w1->east,
@@ -115,8 +113,7 @@
 
     I_georef(w1->west, w1->south, &e0, &n0, group.E12, group.N12);
     I_inverse_ortho_ref(e0, n0, aver_z, &e, &n, &z1, &group.camera_ref,
-			group.XC, group.YC, group.ZC, group.omega, group.phi,
-			group.kappa);
+			group.XC, group.YC, group.ZC, group.MI);
 
     G_debug(1, "SOUTH WEST CORNER");
     G_debug(1, "image  x = %f y = %f, photo x = %f y = %f", w1->west,
@@ -136,8 +133,7 @@
 
     I_georef(w1->east, w1->south, &e0, &n0, group.E12, N12);
     I_inverse_ortho_ref(e0, n0, aver_z, &e, &n, &z1, &group.camera_ref,
-			group.XC, group.YC, group.ZC, group.omega, group.phi,
-			group.kappa);
+			group.XC, group.YC, group.ZC, group.MI);
 
     G_debug(1, "SOUTH EAST CORNER");
     G_debug(1, "image  x = %f y = %f, photo x = %f y = %f", w1->east,

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/rectify.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/rectify.c	2010-11-29 08:08:42 UTC (rev 44475)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.rectify/rectify.c	2010-11-29 08:09:26 UTC (rev 44476)
@@ -88,8 +88,7 @@
 
 	    /* target coordinates e1, n1 to photo coordinates ex1, nx1 */
 	    I_ortho_ref(e1, n1, z1, &ex1, &nx1, &zx1, &group.camera_ref,
-			group.XC, group.YC, group.ZC, group.omega, group.phi,
-			group.kappa);
+			group.XC, group.YC, group.ZC, group.M);
 
 	    G_debug(5, "\t\tAfter ortho ref (photo cords): ex = %f \t nx =  %f",
 		    ex1, nx1);