Changeset 3684 for trunk/psLib/src/collections

Timestamp:

Apr 8, 2005, 7:58:58 AM (21 years ago)

Author:

desonia

Message:

changed name of fileUtils to dataIO to better coorespond to the latest
SDRS.

Location:

trunk/psLib/src/collections

Files:

• Makefile.am (modified) (1 diff)
• psMetadata.h (modified) (2 diffs)
• psVector.c (modified) (4 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/collections/Makefile.am

@@ -4 +4 @@
         -I$(top_srcdir)/src/astronomy \
         -I$(top_srcdir)/src/dataManip \
-        -I$(top_srcdir)/src/fileUtils \
+        -I$(top_srcdir)/src/dataIO \
         -I$(top_srcdir)/src/image \
         -I$(top_srcdir)/src/sysUtils \

trunk/psLib/src/collections/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -317 +317 @@
                             const char* comment, psPtr value);
 
-
 /** Remove an item from metadata collection.
  *

trunk/psLib/src/collections/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
     psVec->type.dimen = PS_DIMEN_VECTOR;
     psVec->type.type = elemType;
-    psVec->nalloc = nalloc;
+    *(int*)&psVec->nalloc = nalloc;
     psVec->n = nalloc;
 
@@ -81 +81 @@
         // Realloc after decrementation to avoid accessing freed array elements
         in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
-        in->nalloc = nalloc;
+        *(int*)&in->nalloc = nalloc;
     }
 
@@ -108 +108 @@
     if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
         in->data.U8 = psRealloc(in->data.U8, byteSize);
-        in->nalloc = n;
+        *(int*)&in->nalloc = n;
     }
 

trunk/psLib/src/collections/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 {
     psType type;                ///< Type of data.
-    psU32 nalloc;        ///< Total number of elements available.
-    psU32 n;             ///< Number of elements in use.
+    int n;                      ///< Number of elements in use.
+    const int nalloc;           ///< Total number of elements available.
 
     union {