Changeset 26714

Timestamp:

Jan 28, 2010, 4:43:00 PM (16 years ago)

Author:

eugene

Message:

updates from the trunk

Location:

branches/eam_branches/20091201/Ohana/src/libdvo

Files:

• Makefile (modified) (2 diffs)
• include/dvo_util.h (copied) (copied from trunk/Ohana/src/libdvo/include/dvo_util.h )
• src/dvo_catalog.c (modified) (2 diffs)
• src/dvo_convert_PS1_REF.c (modified) (1 diff)
• src/dvo_convert_PS1_V1.c (modified) (2 diffs)
• src/dvo_util.c (copied) (copied from trunk/Ohana/src/libdvo/src/dvo_util.c )

branches/eam_branches/20091201/Ohana/src/libdvo/Makefile

@@ -35 +35 @@
 $(DESTINC)/ps1_ref_defs.h
 
-INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h
+INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h
 
 OBJS = \
@@ -72 +72 @@
 $(SRC)/skyregion_gsc.$(ARCH).o    \
 $(SRC)/skyregion_ops.$(ARCH).o \
-$(SRC)/cmf-ps1-v1-alt.$(ARCH).o
+$(SRC)/cmf-ps1-v1-alt.$(ARCH).o \
+$(SRC)/dvo_util.$(ARCH).o
 
 # $(SRC)/dvo_convert_panstarrs.$(ARCH).o \

branches/eam_branches/20091201/Ohana/src/libdvo/src/dvo_catalog.c

@@ -78 +78 @@
     catalog[0].catformat = 0;
     catalog[0].catflags = 0;
-    catalog[0].sorted = 0;
     catalog[0].Nsecfilt = 0;
   }
@@ -92 +91 @@
   catalog[0].objID = 0;
   catalog[0].catID = 0;
+  catalog[0].sorted = 0;
 
   catalog[0].Naverage = 0;

branches/eam_branches/20091201/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

@@ -133 +133 @@
     out[i].objID         = in[i].objID;
     out[i].catID         = in[i].catID;
+    memset(out[i].pad, 0, sizeof(out[i].pad));
   }
   return (out);

branches/eam_branches/20091201/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

@@ -100 +100 @@
     out[i].dXccd      = in[i].dXccd;
     out[i].dYccd      = in[i].dYccd;
+    memset(out[i].pad, 0, sizeof(out[i].pad));
     out[i].posangle   = in[i].posangle;
     out[i].pltscale   = in[i].pltscale;
@@ -386 +387 @@
     out[i].code  = in[i].code;         
     out[i].type  = in[i].type;         
+    memset(out[i].dummy, 0, sizeof(out[i].dummy));
     out[i].C     = in[i].C;            
     out[i].dC    = in[i].dC;