Changeset 37807 for trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/dvo_convert_panstarrs_DEV_0.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

@@ -227 +227 @@
 
   for (i = 0; i < Nvalues; i++) {
-    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
+    // this is only safe because the initial 120 bytes in Coords match CoordsDisk
+    memcpy (&out[i].coords, &in[i].coords, sizeof(CoordsDisk));
+    out[i].coords.mosaic   = NULL;
+    out[i].coords.offsetMap = NULL;
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
@@ -297 +300 @@
 
   for (i = 0; i < Nvalues; i++) {
-    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
+    // this is only safe because the initial 120 bytes in Coords match CoordsDisk
+    memcpy (&out[i].coords, &in[i].coords, sizeof(CoordsDisk));
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN