Changeset 7984 for trunk/psLib

Timestamp:

Jul 25, 2006, 5:37:57 PM (20 years ago)

Author:

Paul Price

Message:

Fixing FITS table vector writing: wasn't copying into the byte vector correctly.

File:

• trunk/psLib/src/fits/psFitsTable.c (modified) (3 diffs)

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-26 02:59:58 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-26 03:37:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -678 +678 @@
                 }
             case PS_DATA_VECTOR: {
-                    psVector *columnData = psVectorAlloc(spec->size * table->n, spec->vectorType);
+                    size_t dataSize = PSELEMTYPE_SIZEOF(spec->vectorType); // Size of data, in bytes
+                    psVector *columnData = psVectorAlloc(spec->size * table->n * dataSize, PS_TYPE_U8);
                     psVectorInit(columnData, 0);
-                    size_t dataSize = PSELEMTYPE_SIZEOF(spec->vectorType); // Size of data, in bytes
                     for (long i = 0; i < table->n; i++) {
                         psMetadata *row = table->data[i]; // The row of interest
@@ -689 +689 @@
                         }
                         psVector *vector = dataItem->data.V;
-                        memcpy(&columnData->data.U8[i * dataSize], vector->data.U8, dataSize);
+                        memcpy(&columnData->data.U8[i * dataSize * spec->size], vector->data.U8,
+                               vector->n * dataSize);
                     }