Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/src/Dvo.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/src/Dvo.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ippToPsps/src/Dvo.c

@@ -47 +47 @@
         externID = atoi(row[1]);
 
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "---------------------------------------------------------------------\n");
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting skylist from DVO database for source ID = %d and extern ID = %d\n",
-                sourceID, externID); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "---------------------------------------------------------------------\n");
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting skylist from DVO database for source ID = %d and extern ID = %d\n",
+        //        sourceID, externID); 
         skyList = dvoSkyListByExternID(this->dvoConfig, sourceID, externID, &image);
         if (!skyList) {
@@ -70 +70 @@
 
         // now get detections
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting detections...\n"); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting detections...\n"); 
         dvoDetection* dvoDetections = NULL;
         int32_t maxDetectionId = -1;
-        int32_t numDetections = 
+        //int32_t numDetections = 
             dvoGetDetections(skyList, image->imageID, &dvoDetections, &maxDetectionId);
 
-        this->logger->print(this->logger, MSG_INFO, "Dvo", 
-                "Found %d detections with a max detection ID of %d\n", 
-                numDetections, maxDetectionId); 
-
-
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Inserting IDs into dvoDetection table...\n"); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", 
+        //        "Found %d detections with a max detection ID of %d\n", 
+        //        numDetections, maxDetectionId); 
+
+
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Inserting IDs into dvoDetection table...\n"); 
 
         uint32_t zeroDvoCount = 0;
@@ -188 +188 @@
     this->dvoConfig = dvoConfigRead(&argc, argv);
 
-    for (int i=0; i<argc; i++) free(argv[i]);
-    free(argv);
+    //for (int i=0; i<argc; i++) free(argv[i]);
+    //free(argv);
 
     // method pointers