Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c	(revision 38427)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c	(revision 38428)
@@ -131,5 +131,5 @@
 
   if (isCompressed) {
-    fprintf (stderr, "compress %s\n", catalog->filename);
+    / fprintf (stderr, "compress %s\n", catalog->filename);
     char *compressMode = dvo_catalog_compress_string (catalog->catcompress);
     // I should test how Ntile affects fpack/funpack and speed
@@ -762,5 +762,4 @@
 int dvo_catalog_save_split (Catalog *catalog, char VERBOSE) {
 
-  off_t Nitems;
   Header header;
   FTable ftable;
@@ -768,5 +767,4 @@
   int Nsecfilt;
   off_t Naverage_disk_new, Nmeasure_disk_new, Nmissing_disk_new, Nsecfilt_disk_new, Nlensing_disk_new, Nlensobj_disk_new, Nstarpar_disk_new, Ngalphot_disk_new;
-  off_t first, start, Nrows;
 
   ftable.header = &header;
@@ -821,7 +819,7 @@
   if ((catalog[0].catflags & DVO_LOAD_AVERAGE) && (catalog[0].average != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Naverage_off; // first disk row to write
-    Nrows  = catalog[0].Naverage - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Naverage_off; // first disk row to write
+    off_t Nrows  = catalog[0].Naverage - first;
 
     assert (Nrows >= 0);
@@ -865,7 +863,7 @@
   if ((catalog[0].catflags & DVO_LOAD_MEASURE) && (catalog[0].measure != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Nmeasure_off; // first disk row to write
-    Nrows  = catalog[0].Nmeasure - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Nmeasure_off; // first disk row to write
+    off_t Nrows  = catalog[0].Nmeasure - first;
 
     assert (Nrows >= 0);
@@ -902,5 +900,5 @@
 
     // if we are going to compress, we need to receive unswapped data -- 
-    int swapFromNative = !output_is_compressed (start, Nrows, Nmissing_disk_new, catalog->catcompress);
+    int swapFromNative = !output_is_compressed (catalog[0].Nmissing_off, catalog[0].Nmissing, Nmissing_disk_new, catalog->catcompress);
 
     // convert to external table format
@@ -923,8 +921,8 @@
   if ((catalog[0].catflags & DVO_LOAD_SECFILT) && (catalog[0].secfilt != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Nsecfilt_off; // first disk row to write
-    Nitems = catalog[0].Naverage*Nsecfilt;
-    Nrows  = Nitems - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Nsecfilt_off; // first disk row to write
+    off_t Nitems = catalog[0].Naverage*Nsecfilt;
+    off_t Nrows  = Nitems - first;
 
     assert (Nrows >= 0);
@@ -956,7 +954,7 @@
   if ((catalog[0].catflags & DVO_LOAD_LENSING) && (catalog[0].lensing != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Nlensing_off; // first disk row to write
-    Nrows  = catalog[0].Nlensing - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Nlensing_off; // first disk row to write
+    off_t Nrows  = catalog[0].Nlensing - first;
 
     assert (Nrows >= 0);
@@ -987,7 +985,7 @@
   if ((catalog[0].catflags & DVO_LOAD_LENSOBJ) && (catalog[0].lensobj != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Nlensobj_off; // first disk row to write
-    Nrows  = catalog[0].Nlensobj - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Nlensobj_off; // first disk row to write
+    off_t Nrows  = catalog[0].Nlensobj - first;
 
     assert (Nrows >= 0);
@@ -1018,7 +1016,7 @@
   if ((catalog[0].catflags & DVO_LOAD_STARPAR) && (catalog[0].starpar != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Nstarpar_off; // first disk row to write
-    Nrows  = catalog[0].Nstarpar - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Nstarpar_off; // first disk row to write
+    off_t Nrows  = catalog[0].Nstarpar - first;
 
     assert (Nrows >= 0);
@@ -1049,7 +1047,7 @@
   if ((catalog[0].catflags & DVO_LOAD_GALPHOT) && (catalog[0].galphot != NULL)) {
 
-    first  = 0;                    // first row in memory to write
-    start  = catalog[0].Ngalphot_off; // first disk row to write
-    Nrows  = catalog[0].Ngalphot - first;
+    off_t first  = 0;                    // first row in memory to write
+    off_t start  = catalog[0].Ngalphot_off; // first disk row to write
+    off_t Nrows  = catalog[0].Ngalphot - first;
 
     assert (Nrows >= 0);