Changeset 28855 for trunk/Ohana/src/libdvo

Timestamp:

Aug 5, 2010, 2:29:00 PM (16 years ago)

Author:

bills

Message:

Enhance dvomerge to handle merging catdirs with different (but compatible) secondary filter lists

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_photcode_ops.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -318 +318 @@
 
 PhotCodeData *GetPhotcodeTable (void);
+void SetPhotcodeTable (PhotCodeData *);
+
+int *GetSecFiltMap(PhotCodeData *ouput, PhotCodeData* input);
 
 int LoadPhotcodes (char *catdir_file, char *master_file, int readwrite);

trunk/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -21 +21 @@
 PhotCodeData *GetPhotcodeTable () {
 
-  /* allocate space to photcode table, free existing data */
   if (photcodes == NULL) {
+    /* allocate space to photcode table */
     ALLOCATE (photcodes, PhotCodeData, 1);
     photcodes[0].code = NULL;
   }
   return photcodes;
+}
+
+// set the photcode table. This is used to switch between serveral previously
+// allocated tables
+void SetPhotcodeTable (PhotCodeData *new) {
+  photcodes = new;  
 }
 
@@ -531 +537 @@
 }
 
+// Create a map between the secfilt values from one photcode table to another
+int *GetSecFiltMap(PhotCodeData *output, PhotCodeData *input) {
+  int i;
+  int NsecfiltIn  = input[0].Nsecfilt;
+  int *map;
+  ALLOCATE(map, int, NsecfiltIn);
+
+  // loop over entries 
+  for (i = 0; i < NsecfiltIn; i++) {
+    int code  = input[0].codeNsec[i];
+    int entry = output[0].hashcode[code];
+    if (entry == -1) {
+      // entry is missing
+      free(map);
+      return(FALSE);
+    }
+    map[i] = entry;
+  }
+
+  return map;
+}
+
 /* photcode table should have the following format: