Changeset 36112 for tags/ipp-20130712

Timestamp:

Sep 11, 2013, 2:44:01 PM (13 years ago)

Author:

bills

Message:

fixes from trunk for dvomerge and dvoverify

Location:

tags/ipp-20130712/Ohana/src/dvomerge

Files:

• . (modified) (1 prop)
• src/dvomerge_client.c (modified) (1 prop)
• src/dvoverify_args.c (modified) (1 diff)
• src/dvoverify_catalogs.c (modified) (1 diff)
• src/dvoverify_utils.c (modified) (1 diff)

tags/ipp-20130712/Ohana/src/dvomerge/src/dvoverify_args.c

@@ -56 +56 @@
   }
 
+  /*** dvoverify -parallel (dvoverify_client, actually) ignores this argument
+       dvoverify should save a subset table of just the IDs, and dvoverify_client should load it
+       dvoverify -cpt should have CHECK_IMAGE_ID = F as default ***/
+       
   CHECK_IMAGE_ID = TRUE;
   if ((N = get_argument (*argc, argv, "-skip-image-ids"))) {

tags/ipp-20130712/Ohana/src/dvomerge/src/dvoverify_catalogs.c

@@ -143 +143 @@
       continue;
     }
-    fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    int Nresults = fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    if (Nresults != 2) {
+      fprintf (stderr, "warning: failure scanning results\n");
+      fclose (results);
+      continue;
+    }
     *Nbad += NbadHost;
     NNotSorted += NNotSortedHost;

tags/ipp-20130712/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -302 +302 @@
     for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
       id = catalog[0].measure[m+j].imageID;
+      if (id == 0) continue; // detections from ref photcodes can (should) have unset image IDs
       if (id > maxID) {
         Nfail ++;