[GRASS-SVN] r57956 - grass/trunk/imagery/i.ortho.photo/i.ortho.camera

[svn_grass at osgeo.org]

Author: turek
Date: 2013-10-08 07:22:49 -0700 (Tue, 08 Oct 2013)
New Revision: 57956

Modified:
   grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
Log:
i.ortho.camera: uninitialized num_fid fix, reading existing camera file fix

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c	2013-10-07 19:52:02 UTC (rev 57955)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c	2013-10-08 14:22:49 UTC (rev 57956)
@@ -125,7 +125,7 @@
 
     if (G_find_file2("camera", camera, G_mapset())) {
 	/* use existing camera file */
-	if (I_get_cam_info(camera, &cam_info))
+	if (!I_get_cam_info(camera, &cam_info))
 	    G_fatal_error(_("Can not read camera file '%s'"), camera);
 
 	if (cam_name && strcmp(cam_name, cam_info.cam_name)) {
@@ -179,6 +179,7 @@
     }
 
     /* fiducials */
+    cam_info.num_fid = 0;
     if (fid_opt->answers) {
 	int i, fid_no;
 	double Xf, Yf;