Jelajahi Sumber

i.ortho.camera: uninitialized num_fid fix, reading existing camera file fix

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57956 15284696-431f-4ddb-bdfa-cd5b030d7da7
Štěpán Turek 11 tahun lalu
induk
melakukan
518b3b83cb
1 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 1
      imagery/i.ortho.photo/i.ortho.camera/main.c

+ 2 - 1
imagery/i.ortho.photo/i.ortho.camera/main.c

@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
 
 
     if (G_find_file2("camera", camera, G_mapset())) {
     if (G_find_file2("camera", camera, G_mapset())) {
 	/* use existing camera file */
 	/* 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);
 	    G_fatal_error(_("Can not read camera file '%s'"), camera);
 
 
 	if (cam_name && strcmp(cam_name, cam_info.cam_name)) {
 	if (cam_name && strcmp(cam_name, cam_info.cam_name)) {
@@ -179,6 +179,7 @@ int main(int argc, char *argv[])
     }
     }
 
 
     /* fiducials */
     /* fiducials */
+    cam_info.num_fid = 0;
     if (fid_opt->answers) {
     if (fid_opt->answers) {
 	int i, fid_no;
 	int i, fid_no;
 	double Xf, Yf;
 	double Xf, Yf;