Changeset 4401 for trunk/psLib/src/collections/psPixels.c

Timestamp:

Jun 27, 2005, 10:38:12 AM (21 years ago)

Author:

drobbin

Message:

made required changes based on apidelta-report-cycle6

File:

• trunk/psLib/src/collections/psPixels.c (modified) (6 diffs)

trunk/psLib/src/collections/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 02:02:05 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-27 20:38:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 }
 
-psPixels* psPixelsAlloc(int size)
+psPixels* psPixelsAlloc(psU32 nalloc)
 {
     psPixels* out = psAlloc(sizeof(psPixels));
 
-    if (size > 0) {
-        out->data = psAlloc(sizeof(psPixelCoord)*size);
+    if (nalloc > 0) {
+        out->data = psAlloc(sizeof(psPixelCoord)*nalloc);
     } else {
         out->data = NULL;
     }
-    out->n = size;
-    out->nalloc = size;
+    out->n = nalloc;
+    out->nalloc = nalloc;
 
     psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
@@ -72 +72 @@
 }
 
-psPixels* psPixelsRealloc(psPixels* pixels, int size)
-{
-    if (pixels == NULL) {
-        return psPixelsAlloc(size);
-    }
-
-    if (size > 0) {
-        pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*size);
+psPixels* psPixelsRealloc(psPixels* pixels, psU32 nalloc)
+{
+    if (pixels == NULL) {
+        return psPixelsAlloc(nalloc);
+    }
+
+    if (nalloc > 0) {
+        pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*nalloc);
     } else {
         psFree(pixels->data);
@@ -85 +85 @@
     }
 
-    pixels->nalloc = size;
+    pixels->nalloc = nalloc;
 
     if (pixels->n > pixels->nalloc) {
@@ -130 +130 @@
 }
 
-psImage *psPixelsToMask(psImage *out, const psPixels *pixels, const psRegion region, unsigned int maskVal)
+psImage *psPixelsToMask(psImage *out, const psPixels *pixels, psRegion region, psMaskType maskVal)
 {
     // check that the input pixel vector is valid
@@ -197 +197 @@
 }
 
-psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, unsigned int maskVal)
+psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, psMaskType maskVal)
 {
     if (mask == NULL) {