IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 29, 2009, 10:46:54 AM (17 years ago)
Author:
giebink
Message:

conform to src

Location:
trunk/psModules/test/concepts
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/concepts/tap_pmConcepts.c

    r15986 r21223  
    33 *  @brief Contains the tests for pmConcepts.c:
    44 *
    5  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2008-01-02 20:49:56 $
     5 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2009-01-29 20:45:54 $
    77*   pmConceptSpecAlloc()
    88    pmConceptsList()
    … …  
    289289        psF64 tmpF64;
    290290        psS32 tmpS32;
    291         pmFPA *fpa = pmFPAAlloc(NULL);
     291        pmFPA *fpa = pmFPAAlloc(NULL, NULL);
    292292        bool rc = false;
    293293

  • trunk/psModules/test/concepts/tap_pmConceptsAverage.c

    r16008 r21223  
    140140pmFPA* generateSimpleFPA(psMetadata *camera)
    141141{
    142     pmFPA* fpa = pmFPAAlloc(camera);
     142    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    143143    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    144144    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/concepts/tap_pmConceptsPhotcode.c

    r15986 r21223  
    1717
    1818
    19     // ----------------------------------------------------------------------
    20     // pmConceptsPhotcodeForView() tests: NULL pmConfig input
    21     // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
    22     {
    23         psMemId id = psMemGetId();
    24         pmConfig *config =pmConfigAlloc();
    25         pmFPAfile *file = pmFPAfileAlloc();
    26         pmFPAview *view = pmFPAviewAlloc(32);
    27         ok(NULL == pmConceptsPhotcodeForView(NULL, file, view),
    28           "pmConceptsPhotcodeForView(NULL, file, view) returned NULL");
    29         psFree(config);
    30         psFree(file);
    31         psFree(view);
    32         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    33     }
    34 
    35 
    36     // pmConceptsPhotcodeForView() tests: NULL pmConfig input
    37     // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
    38     {
    39         psMemId id = psMemGetId();
    40         pmConfig *config =pmConfigAlloc();
    41         pmFPAfile *file = pmFPAfileAlloc();
    42         pmFPAview *view = pmFPAviewAlloc(32);
    43         ok(NULL == pmConceptsPhotcodeForView(NULL, file, view),
    44           "pmConceptsPhotcodeForView(NULL, file, view) returned NULL");
    45         psFree(config);
    46         psFree(file);
    47         psFree(view);
    48         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    49     }
    50 
    51 
    5219    // pmConceptsPhotcodeForView() tests: NULL pmFPAfile input
    5320    // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
    … …  
    5724        pmFPAfile *file = pmFPAfileAlloc();
    5825        pmFPAview *view = pmFPAviewAlloc(32);
    59         ok(NULL == pmConceptsPhotcodeForView(config, NULL, view),
     26        ok(NULL == pmConceptsPhotcodeForView(NULL, view),
    6027          "pmConceptsPhotcodeForView(config, NULL, view) returned NULL");
    6128        psFree(config);
    … …  
    7340        pmFPAfile *file = pmFPAfileAlloc();
    7441        pmFPAview *view = pmFPAviewAlloc(32);
    75         ok(NULL == pmConceptsPhotcodeForView(config, file, NULL),
     42        ok(NULL == pmConceptsPhotcodeForView(file, NULL),
    7643          "pmConceptsPhotcodeForView(config, file, NULL) returned NULL");
    7744        psFree(config);
    … …  
    10471        psString goodPhotcode = pmFPAfileNameFromRule(rule, file, view);
    10572
    106         psString testPhotcode = pmConceptsPhotcodeForView(config, file, view);
     73        psString testPhotcode = pmConceptsPhotcodeForView(file, view);
    10774        ok(testPhotcode, "pmConceptsPhotcodeForView(config, file, view) returned non-NULL");
    10875        ok(!strcmp(goodPhotcode, testPhotcode), "pmConceptsPhotcodeForView() produced the correct string");

  • trunk/psModules/test/concepts/tap_pmConceptsUpdate.c

    r16008 r21223  
    141141pmFPA* generateSimpleFPA(psMetadata *camera)
    142142{
    143     pmFPA* fpa = pmFPAAlloc(camera);
     143    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    144144    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    145145    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
Note: See TracChangeset for help on using the changeset viewer.