Changeset 4203

Timestamp:

Jun 9, 2005, 1:51:49 PM (21 years ago)

Author:

desonia

Message:

changed psPixelsAlloc to set n to nalloc (as psVectorAlloc does).

Location:

trunk/psLib

Files:

• pslib.kdevelop.pcs (modified) ( previous)
• pslib.kdevses (modified) (1 diff)
• src/collections/psPixels.c (modified) (2 diffs)
• src/types/psPixels.c (modified) (2 diffs)
• test/collections/tst_psPixels.c (modified) (5 diffs)

trunk/psLib/pslib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="1" >
+ <DocsAndViews NumberOfDocuments="7" >
   <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/dataIO/psFits.h" >
-   <View0 line="242" Type="Source" />
+   <View0 line="243" Type="Source" />
   </Doc0>
+  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/dataIO/psFits.c" >
+   <View0 line="1525" Type="Source" />
+  </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/collections/psMetadata.h" >
+   <View0 line="418" Type="Source" />
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/dataIO/tst_psFits.c" >
+   <View0 line="123" Type="Source" />
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/image/tst_psImageGeomManip.c" >
+   <View0 line="560" Type="Source" />
+  </Doc4>
+  <Doc5 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImageConvolve.c" >
+   <View0 line="435" Type="Source" />
+  </Doc5>
+  <Doc6 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImageFFT.c" >
+   <View0 line="413" Type="Source" />
+  </Doc6>
  </DocsAndViews>
  <pluginList>

trunk/psLib/src/collections/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 19:47:19 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 23:51:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
         out->data = NULL;
     }
-    out->n = 0;
+    out->n = size;
     out->nalloc = size;
 

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 19:47:19 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 23:51:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
         out->data = NULL;
     }
-    out->n = 0;
+    out->n = size;
     out->nalloc = size;
 

trunk/psLib/test/collections/tst_psPixels.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $
+ *  @version $Revision: 1.7 $
  *           $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 19:48:15 $
+ *  @date $Date: 2005-06-09 23:51:49 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
         return 2;
     }
-    if (p0->n != 0) {
+    if (p0->n != p0->nalloc) {
         psError(PS_ERR_UNKNOWN, true,
                 "psPixelsAlloc failed to set n = 0");
@@ -84 +84 @@
     p1->data[0].y = 2;
 
-    if (p1->n != 0) {
-        psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set n = 0");
+    if (p1->n != p1->nalloc) {
+        psError(PS_ERR_UNKNOWN, true,
+                "psPixelsAlloc failed to set n = %d", p1->nalloc);
         return 13;
     }
@@ -113 +113 @@
     }
 
-    if (p2->n != 0) {
-        psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set n = 0");
+    if (p2->n != p2->nalloc) {
+        psError(PS_ERR_UNKNOWN, true,
+                "psPixelsAlloc failed to set n = %d", p2->nalloc);
         return 13;
     }
@@ -149 +149 @@
         return 2;
     }
-    if (p0->n != 0) {
+    if (p0->n != p0->nalloc) {
         psError(PS_ERR_UNKNOWN, true,
                 "psPixelsRealloc failed to set n = 0");