Changeset 23443

Timestamp:

Mar 19, 2009, 3:59:01 PM (17 years ago)

Author:

Paul Price

Message:

Allocators should never return NULL.

File:

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

trunk/psLib/src/mathtypes/psImage.c

@@ -55 +55 @@
 
         // drop my entry on my parent's array of children
-        // lock parent before freeing child : psArrayRemoveDataNoFree is NOT thread safe
-        psMutexLock (parent);
+        // lock parent before freeing child : psArrayRemoveDataNoFree is NOT thread safe
+        psMutexLock (parent);
         psArrayRemoveDataNoFree (parent->children, image);
-        psMutexUnlock (parent);
+        psMutexUnlock (parent);
 
         // drop my reference to my parent
@@ -87 +87 @@
     int rowSize = numCols * elementSize;        // row size in bytes.
 
-    if (numRows < 1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified number of rows (%d) or columns (%d) is invalid."),
-                numRows, numCols);
-        return NULL;
-    }
-    if (numCols < 1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified number of rows (%d) or columns (%d) is invalid."),
-                numRows, numCols);
-        return NULL;
+    if (numRows < 1 || numCols < 1) {
+        psAbort(_("Specified number of rows (%d) or columns (%d) is invalid."), numRows, numCols);
     }