Changeset 38466 for trunk/Ohana/src/relphot/src/synthetic_zpts.c

Timestamp:

Jun 12, 2015, 10:28:36 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

• trunk/Ohana/src/relphot/src/synthetic_zpts.c (modified) (4 diffs)

trunk/Ohana/src/relphot/src/synthetic_zpts.c

@@ -7 +7 @@
 static char *extname[5] = {"map_g", "map_r", "map_i", "map_z", "map_y"};
 
-SynthZeroPoints *SynthZeroPointsLoad (char *filename) {
+static SynthZeroPoints *zpts = NULL;
+
+int SynthZeroPointsLoad (char *filename) {
 
   FILE *f = fopen (filename, "r");
   if (!f) {
     fprintf (stderr, "ERROR: cannot open file %s\n", filename);
-    return NULL;
+    return FALSE;
   }
 
@@ -23 +25 @@
   // map_y
 
-  SynthZeroPoints *zpts = NULL;
   ALLOCATE (zpts, SynthZeroPoints, 1);
   
@@ -29 +30 @@
     if (VERBOSE) fprintf (stderr, "can't read header\n");
     fclose (f);
-    return NULL;
+    return FALSE;
   }
 
@@ -49 +50 @@
   zpts->Ny = zpts->matrix[0].Naxis[1];
 
+  return TRUE;
+}
+
+SynthZeroPoints *SynthZeroPointsGet () {
   return zpts;
 }
-