Changeset 693 for trunk/psLib/src/image/psImage.c

Timestamp:

May 14, 2004, 2:14:56 PM (22 years ago)

Author:

desonia

Message:

Fixed error found during testing of psImage.

File:

• trunk/psLib/src/image/psImage.c (modified) (2 diffs)

trunk/psLib/src/image/psImage.c

@@ -7 +7 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-14 22:39:58 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-15 00:14:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
     area = numCols*numRows;
 
+    if (area < 1) {
+        psError(__func__, "Invalid value for number of rows or columns (numRows=%d, numCols=%d).",
+                numRows, numCols);
+        return NULL;
+    }
+
     psImage *image = (psImage *)psAlloc(sizeof(psImage));
 
-    if(area < 1) {
-        image->data.v[0] = NULL;
-    } else {
-        image->data.v[0] = psAlloc(area*elementSize);
+    image->data.v = psAlloc(sizeof(void*)*numRows);
 
-        for(int i = 1; i < numRows; i++) {
-            image->data.v[i] = (void*)((int8_t*)image->data.v[i-1]+rowSize);
-        }
+    image->data.v[0] = psAlloc(area*elementSize);
+
+    for(int i = 1; i < numRows; i++) {
+        image->data.v[i] = (void*)((int8_t*)image->data.v[i-1]+rowSize);
     }