Changeset 4597 for trunk/psLib/src/types

Timestamp:

Jul 22, 2005, 12:19:31 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/types

Files:

• psArray.c (modified) (3 diffs)
• psArray.h (modified) (2 diffs)
• psPixels.c (modified) (3 diffs)
• psPixels.h (modified) (2 diffs)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-22 22:19:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
     psMemSetDeallocator(psArr, (psFreeFunc) arrayFree);
 
-    psArr->nalloc = nalloc;
+    *(long*)&psArr->nalloc = nalloc;
     psArr->n = nalloc;
 
@@ -80 +80 @@
         // Realloc after decrementation to avoid accessing freed array elements
         in->data = psRealloc(in->data, nalloc * sizeof(psPtr));
-        in->nalloc = nalloc;
+        *(long*)&in->nalloc = nalloc;
     }
 

trunk/psLib/src/types/psArray.h

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-22 22:19:17 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 typedef struct
 {
-    long nalloc;                       ///< Total number of elements available.
     long n;                            ///< Number of elements in use.
+    const long nalloc;                 ///< Total number of elements available.
     psPtr* data;                       ///< An Array of pointer elements
     void *lock;                        ///< Optional lock for thread safety

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-22 22:19:27 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
     }
     out->n = nalloc;
-    out->nalloc = nalloc;
+    *(long*)&out->nalloc = nalloc;
 
     psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
@@ -85 +85 @@
     }
 
-    pixels->nalloc = nalloc;
+    *(long*)&pixels->nalloc = nalloc;
 
     if (pixels->n > pixels->nalloc) {

trunk/psLib/src/types/psPixels.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-22 22:19:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 {
     long n;                            ///< Number in usa
-    long nalloc;                       ///< Number allocated
+    const long nalloc;                 ///< Number allocated
     psPixelCoord* data;                ///< The pixel coordinates
     void *lock;                        ///< Option lock for thread safety