Changeset 3671 for trunk/psLib/src/image

Timestamp:

Apr 5, 2005, 3:12:58 PM (21 years ago)

Author:

desonia

Message:

Removed PS_TYPE_PTR from psElemType, as per latest SDRS.

Location:

trunk/psLib/src/image

Files:

• psImage.c (modified) (4 diffs)
• psImageFFT.c (modified) (4 diffs)

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-18 02:35:14 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 01:12:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
     if (image == NULL) {
         return;
-    }
-
-    if (image->type.type == PS_TYPE_PTR) {
-        // 2-D array of pointers -- must dereference elements
-        psU32 oldNumRows = image->numRows;
-        psU32 oldNumCols = image->numCols;
-        psPtr* rowPtr;
-
-        for (psU32 row = 0; row < oldNumRows; row++) {
-            rowPtr = image->data.PTR[row];
-            for (psU32 col = 0; col < oldNumCols; col++) {
-                psMemDecrRefCounter(rowPtr[col]);
-            }
-        }
     }
 
@@ -188 +174 @@
     }
 
-    if (old->type.type == PS_TYPE_PTR) {
-        // 2-D array of pointers -- must
-        // dereference
-        psU32 oldNumRows = old->numRows;
-        psU32 oldNumCols = old->numCols;
-        psPtr* rowPtr;
-
-        for (psU32 row = 0; row < oldNumRows; row++) {
-            rowPtr = old->data.PTR[row];
-            for (psU32 col = 0; col < oldNumCols; col++) {
-                psMemDecrRefCounter(rowPtr[col]);
-                rowPtr[col] = NULL;
-            }
-        }
-    }
-
     /* image already the right size/type? */
     if (numCols == old->numCols && numRows == old->numRows &&
@@ -263 +233 @@
     elements = numRows * numCols;
     elementSize = PSELEMTYPE_SIZEOF(inDatatype);
-
-    if (inDatatype == PS_TYPE_PTR || type == PS_TYPE_PTR) {
-        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
-                PS_TYPE_PTR_NAME);
-        psFree(output);
-        return NULL;
-    }
 
     output = psImageRecycle(output, numCols, numRows, type);

trunk/psLib/src/image/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 19:38:44 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 01:12:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -126 +126 @@
 
     /* if not a complex number, this is logically just a copy then */
-    if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
+    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
         return psImageCopy(out, in, type);
     }
@@ -186 +186 @@
 
     /* if not a complex image type, this is logically just zeroed image of same size */
-    if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
+    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
         out = psImageRecycle(out, numCols, numRows, type);
         memset(out->data.V[0], 0, PSELEMTYPE_SIZEOF(type) * numCols * numRows);
@@ -327 +327 @@
 
     /* if not a complex image, this is logically just a image copy */
-    if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
+    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
         return psImageCopy(out, in, type);
     }