[GRASS-SVN] r44474 - grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target

[svn_grass at osgeo.org]

Author: mmetz
Date: 2010-11-29 00:08:10 -0800 (Mon, 29 Nov 2010)
New Revision: 44474

Modified:
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/analyze.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/ask.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/equ.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/group.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/zoom.c
Log:
adapt to ortholib

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/analyze.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/analyze.c	2010-11-29 08:07:03 UTC (rev 44473)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/analyze.c	2010-11-29 08:08:10 UTC (rev 44474)
@@ -410,8 +410,7 @@
 			    temp_points.z2[n],
 			    &e1, &n1, &z1,
 			    &group.camera_ref,
-			    group.XC, group.YC, group.ZC,
-			    group.omega, group.phi, group.kappa);
+			    group.XC, group.YC, group.ZC, group.MI);
 
 /*****
 	I_inverse_ortho_ref    (group.control_points.e1[n], 

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/ask.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/ask.c	2010-11-29 08:07:03 UTC (rev 44473)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/ask.c	2010-11-29 08:08:10 UTC (rev 44474)
@@ -187,7 +187,7 @@
 	    if (fgets(buf, sizeof buf, fd) == NULL
 		|| sscanf(buf, "%s %s", name, mapset) != 2)
 		break;
-	    if (new_mapset = (strcmp(cur_mapset, mapset) != 0)) {
+	    if ((new_mapset = (strcmp(cur_mapset, mapset)) != 0)) {
 		if (line)
 		    line++;
 		if (col)

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/equ.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/equ.c	2010-11-29 08:07:03 UTC (rev 44473)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/equ.c	2010-11-29 08:08:10 UTC (rev 44474)
@@ -38,7 +38,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.2target/group.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/group.c	2010-11-29 08:07:03 UTC (rev 44473)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/group.c	2010-11-29 08:08:10 UTC (rev 44474)
@@ -55,8 +55,9 @@
     const int *a = aa, *b = bb;
     int n;
 
-    if (n = strcmp(group.group_ref.file[*a].mapset, group.group_ref.file[*b].
-		   mapset))
+    if ((n =
+	strcmp(group.group_ref.file[*a].mapset,
+	       group.group_ref.file[*b].mapset)) != 0)
 	return n;
     return strcmp(group.group_ref.file[*a].name,
 		  group.group_ref.file[*b].name);

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/zoom.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/zoom.c	2010-11-29 08:07:03 UTC (rev 44473)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/zoom.c	2010-11-29 08:08:10 UTC (rev 44474)
@@ -43,8 +43,7 @@
     for (i = 0; i < 3; i++) {
 	I_inverse_ortho_ref(spx, spy, spz, trx, try, &trz,
 			    &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(2, "target raster: %.0f %.0f", *trx, *try);
 	get_z_from_cell2(*try, *trx, &spz);