Changeset 33639

Timestamp:

Mar 30, 2012, 2:51:52 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/Ohana/src

Files:

• getstar/src/dvoImagesAtCoords.c (modified) (1 diff)
• libdvo/src/dvo_util.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/getstar/src/dvoImagesAtCoords.c

@@ -158 +158 @@
         }
         if  (copy) {
-            free(copy);
+          free(copy);
         }
     }

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/src/dvo_util.c

@@ -276 +276 @@
   FREE(detections);
 
-  if (NInvalidDetID) fprintf (stderr, "ERROR: Encountered %ld invalid detection IDs\n", NInvalidDetID);
+  if (NInvalidDetID) fprintf (stderr, "ERROR: Encountered %zx invalid detection IDs\n", NInvalidDetID);
 
   return (Ndetect);