Changeset 28855 for trunk/Ohana/src/dvomerge/src/dvoconvert.c

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

File:

• trunk/Ohana/src/dvomerge/src/dvoconvert.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/dvoconvert.c

@@ -85 +85 @@
         continue;
       }
-      merge_catalogs_new (&outsky[0].regions[i], &outcatalog, &incatalog);
+      merge_catalogs_new (&outsky[0].regions[i], &outcatalog, &incatalog, NULL);
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);