Changeset 3682 for trunk/psLib/test/image/tst_psImage.c

Timestamp:

Apr 7, 2005, 10:27:42 AM (21 years ago)

Author:

desonia

Message:

changed name of p_psMemSetDeallocator/p_psMemGetDeallocator to
psMemSetDeallocator/psMemGetDeallocator.

-rdd

File:

• trunk/psLib/test/image/tst_psImage.c (modified) (4 diffs)

trunk/psLib/test/image/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:25 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psType.h"
 
@@ -51 +51 @@
                           0,1,100,1,150,100
                       };
-    psU32 types = 13;
+    psU32 types = 12;
     psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
                           PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
-                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64,
-                          PS_TYPE_PTR };
+                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64};
 
     psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
@@ -193 +192 @@
                         }
                     }
-                }
-                break;
-            case PS_TYPE_PTR: {
-                    psU32 rows = numRows[i];
-                    psU32 cols = numCols[i];
-                    psImage* temp = psImageAlloc(1,1,PS_TYPE_F32);
-
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            image->data.PTR[r][c] = psMemIncrRefCounter(temp);
-                        }
-                    }
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            if (image->data.PTR[r][c] != temp) {
-                                psError(PS_ERR_UNKNOWN, true, "Could not set pixel in pointer image at (%d,%d): %x %x",
-                                        c,r,image->data.PTR[r][c],temp);
-                                psFree(image);
-                                psFree(temp);
-                                return 8;
-                            }
-                        }
-                    }
-                    psFree(temp);
                 }
                 break;