IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
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

Location:
trunk/psLib/test/image
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/image/tst_psImage.c

    r3264 r3682  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:25 $
     8 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-04-07 20:27:42 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818
    1919#include "psTest.h"
    20 #include "pslib.h"
     20#include "pslib_strict.h"
    2121#include "psType.h"
    2222
    … …  
    5151                          0,1,100,1,150,100
    5252                      };
    53     psU32 types = 13;
     53    psU32 types = 12;
    5454    psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
    5555                          PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
    56                           PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64,
    57                           PS_TYPE_PTR };
     56                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64};
    5857
    5958    psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
    … …  
    193192                        }
    194193                    }
    195                 }
    196                 break;
    197             case PS_TYPE_PTR: {
    198                     psU32 rows = numRows[i];
    199                     psU32 cols = numCols[i];
    200                     psImage* temp = psImageAlloc(1,1,PS_TYPE_F32);
    201 
    202                     for (psS32 r=0;r<rows;r++) {
    203                         for (psS32 c=0;c<cols;c++) {
    204                             image->data.PTR[r][c] = psMemIncrRefCounter(temp);
    205                         }
    206                     }
    207                     for (psS32 r=0;r<rows;r++) {
    208                         for (psS32 c=0;c<cols;c++) {
    209                             if (image->data.PTR[r][c] != temp) {
    210                                 psError(PS_ERR_UNKNOWN, true, "Could not set pixel in pointer image at (%d,%d): %x %x",
    211                                         c,r,image->data.PTR[r][c],temp);
    212                                 psFree(image);
    213                                 psFree(temp);
    214                                 return 8;
    215                             }
    216                         }
    217                     }
    218                     psFree(temp);
    219194                }
    220195                break;

  • trunk/psLib/test/image/tst_psImageConvolve.c

    r2911 r3682  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-01-05 21:16:15 $
     7 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-04-07 20:27:42 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1717
    1818#include "psTest.h"
    19 #include "pslib.h"
     19#include "pslib_strict.h"
    2020#include "psType.h"
    2121

  • trunk/psLib/test/image/tst_psImageExtraction.c

    r3311 r3682  
    66*  @author Robert DeSonia, MHPCC
    77*
    8 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    9 *  @date $Date: 2005-02-23 21:36:57 $
     8*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     9*  @date $Date: 2005-04-07 20:27:42 $
    1010*
    1111*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1515
    1616#include "psTest.h"
    17 #include "pslib.h"
     17#include "pslib_strict.h"
    1818#include "psType.h"
    1919

  • trunk/psLib/test/image/tst_psImageFFT.c

    r3264 r3682  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:25 $
     8 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-04-07 20:27:42 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616
    1717#include "psTest.h"
    18 #include "pslib.h"
     18#include "pslib_strict.h"
    1919
    2020#define GENIMAGE(img,c,r,TYP, valueFcn) \

  • trunk/psLib/test/image/tst_psImageIO.c

    r3264 r3682  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:25 $
     8 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-04-07 20:27:42 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121
    2222#include "psTest.h"
    23 #include "pslib.h"
     23#include "pslib_strict.h"
    2424
    2525#define GENIMAGE(img,c,r,TYP, valueFcn) \

  • trunk/psLib/test/image/tst_psImageInterpolate.c

    r3446 r3682  
    55 * @author Eric Van Alst, MHPCC
    66 *
    7  * @version $Revision: 1.5 $
     7 * @version $Revision: 1.6 $
    88 *          $Name: not supported by cvs2svn $
    9  * @date $Date: 2005-03-18 02:35:15 $
     9 * @date $Date: 2005-04-07 20:27:42 $
    1010 *
    1111 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1414
    1515#include "psTest.h"
    16 #include "pslib.h"
     16#include "pslib_strict.h"
    1717
    1818#define GENIMAGE(img,c,r,TYP,valueFcn) \
    … …  
    100100
    101101    // Perform interpolation with invalid input image type
    102     img1 = psImageAlloc(10,10,PS_TYPE_PTR);
     102    img1 = psImageAlloc(10,10,PS_TYPE_BOOL);
    103103    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
    104104    val = psImagePixelInterpolate(img1,1.2,1.2,NULL,0,10.0,PS_INTERPOLATE_FLAT);

  • trunk/psLib/test/image/tst_psImageManip.c

    r3446 r3682  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-03-18 02:35:15 $
     8 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-04-07 20:27:42 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2222
    2323#include "psTest.h"
    24 #include "pslib.h"
     24#include "pslib_strict.h"
    2525#include "psType.h"
    2626
    … …  
    17881788    // Verify that that an invalid image type is handled properly
    17891789    psErrorClear();
    1790     psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_PTR);
    1791     memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psPtr)); // make sure the image is of all NULLs
     1790    psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_BOOL);
     1791    memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psBool)); // make sure the image is of all NULLs
    17921792    result = psImageResample(result,invImage,2,PS_INTERPOLATE_FLAT);
    17931793    if (result != NULL) {

  • trunk/psLib/test/image/tst_psImageStats.c

    r3310 r3682  
    1515#include <math.h>
    1616
    17 #include "pslib.h"
     17#include "pslib_strict.h"
    1818#include "psTest.h"
    1919

  • trunk/psLib/test/image/verified/tst_psImage.stderr

    r3127 r3682  
    7979<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    8080    Specified number of rows (0) or columns (0) is invalid.
    81 <DATE><TIME>|<HOST>|I|testImageAlloc
    82     Testing psImage with type 0h
    83 <DATE><TIME>|<HOST>|I|testImageAlloc
    84     Following should be an error.
    85 <DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    86     Specified number of rows (0) or columns (0) is invalid.
    8781
    8882---> TESTPOINT PASSED (psImage{psImageAlloc} | tst_psImage.c)

  • trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr

    r3127 r3682  
    2121    Following should generate an error message
    2222<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
    23     Specified psImage type, psPtr, is not supported.
     23    Specified psImage type, psBool, is not supported.
    2424<DATE><TIME>|<HOST>|I|testInterpolateError
    2525    Following should generate an error message
    2626<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
    27     Specified psImage type, psPtr, is not supported.
     27    Specified psImage type, psBool, is not supported.
    2828
    2929---> TESTPOINT PASSED (psImagePixelInterpolate{psImagePixelInterpolate} | tst_psImageInterpolate.c)

  • trunk/psLib/test/image/verified/tst_psImageManip.stderr

    r3446 r3682  
    424424    Specified interpolation mode, -1, is unsupported.
    425425<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
    426     Specified psImage type, psPtr, is not supported.
     426    Specified psImage type, psBool, is not supported.
    427427
    428428---> TESTPOINT PASSED (psImage{psImageResample} | tst_psImageManip.c)
Note: See TracChangeset for help on using the changeset viewer.