Changeset 29026

Timestamp:

Aug 23, 2010, 4:11:43 PM (16 years ago)

Author:

bills

Message:

in MatchImage() we can't depend on the location of an image in the images table is imageID - 1. But it usually is, so check. If it isn't found do the search as before.

File:

• trunk/Ohana/src/opihi/dvo/ImageSelection.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/ImageSelection.c

@@ -47 +47 @@
 Image *MatchImage (unsigned int time, short int source, unsigned int imageID) { 
 
-  int m;
+  int m = -1;
 
   if ((imageID != 0) && (imageID < Nimage)) {
-    m = (int) imageID - 1;
-  } else {
+    // imageID is in range for the array of images. If the table is still in order and
+    // no images have been deleted the index of the image we are looking for will be imageID - 1
+    // If this is the case, we have it. Otherwise we'll have to go search for it below
+    int guess = (int) imageID - 1;
+    if (image[guess].imageID == imageID) {
+        m = guess;
+    }
+  } 
+  if (m == -1) {
     m = match_image_subset (image, subset, Nsubset, time, source);
   }