IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

conform to src

Location:
trunk/psModules/test/camera
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/camera/tap_pmFPA.c

    r16008 r21220  
    9999pmFPA* generateSimpleFPA(psMetadata *camera)
    100100{
    101     pmFPA* fpa = pmFPAAlloc(camera);
     101    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    102102    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    103103    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    … …  
    129129    {
    130130        psMemId id = psMemGetId();
    131         pmFPA* fpa = pmFPAAlloc(NULL);
     131        pmFPA* fpa = pmFPAAlloc(NULL, NULL);
    132132        ok(fpa != NULL && psMemCheckFPA(fpa), "pmFPAAlloc() returned a non-NULL pmFPA with a NULL pmCamera input");
    133133        psFree(fpa);
    … …  
    139139        psMemId id = psMemGetId();
    140140        psMetadata *camera = psMetadataAlloc();
    141         pmFPA* fpa = pmFPAAlloc(camera);
     141        pmFPA* fpa = pmFPAAlloc(camera, NULL);
    142142        ok(fpa != NULL, "pmFPAAlloc() returned a non-NULL");
    143143        ok(fpa->fromTPA == NULL, "pmFPAAlloc() set ->fromTPA to NULL");

  • trunk/psModules/test/camera/tap_pmFPACellSquish.c

    r16008 r21220  
    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();

  • trunk/psModules/test/camera/tap_pmFPACopy.c

    r16007 r21220  
    116116pmFPA* generateSimpleFPASource(psMetadata *camera)
    117117{
    118     pmFPA* fpa = pmFPAAlloc(camera);
     118    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    119119    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    120120    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    … …  
    206206pmFPA* generateSimpleFPATarget(psMetadata *camera)
    207207{
    208     pmFPA* fpa = pmFPAAlloc(camera);
     208    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    209209    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    210210    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/camera/tap_pmFPAExtent.c

    r16008 r21220  
    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/camera/tap_pmFPAFlags.c

    r16008 r21220  
    163163pmFPA* generateSimpleFPA(psMetadata *camera)
    164164{
    165     pmFPA* fpa = pmFPAAlloc(camera);
     165    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    166166    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    167167    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/camera/tap_pmFPAHeader.c

    r16008 r21220  
    142142pmFPA* generateSimpleFPA(psMetadata *camera)
    143143{
    144     pmFPA* fpa = pmFPAAlloc(camera);
     144    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    145145    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    146146    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    … …  
    181181        ok(chip != NULL, "Allocated a pmChip successfully");
    182182        ok(cell != NULL, "Allocated a pmCell successfully");
    183         ok(!pmCellReadHeader(cell, NULL), "pmCellReadHeader(cell, NULL) returned FALSE");
     183        ok(!pmCellReadHeader(cell, NULL, NULL), "pmCellReadHeader(cell, NULL) returned FALSE");
    184184        psFree(fpa);
    185185        psFree(camera);
    … …  
    193193        psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
    194194        ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
    195         ok(!pmCellReadHeader(NULL, fitsFileW), "pmCellReadHeader(NULL, fitsFile) returned FALSE");
     195        ok(!pmCellReadHeader(NULL, fitsFileW, NULL), "pmCellReadHeader(NULL, fitsFile) returned FALSE");
    196196        psFree(fitsFileW);
    197197        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    225225            }
    226226            ok(rc == true, "pmConfigFileRead() was successful");
    227             rc = pmHDUWrite(hdu, fitsFileW);
     227            rc = pmHDUWrite(hdu, fitsFileW, NULL);
    228228            ok(rc == true, "pmHDUWrite() successfully wrote the header");
    229229            psFree(hdu);
    … …  
    242242        ok(cell != NULL, "Allocated a pmCell successfully");
    243243
    244         ok(pmCellReadHeader(cell, fitsFileR), "pmCellReadHeader() returned TRUE with acceptable data");
     244        ok(pmCellReadHeader(cell, fitsFileR, NULL), "pmCellReadHeader() returned TRUE with acceptable data");
    245245
    246246        // XXX: It's not clear if we should test if the HDU and pmConcepts actually
    … …  
    266266        ok(chip != NULL, "Allocated a pmChip successfully");
    267267        ok(cell != NULL, "Allocated a pmCell successfully");
    268         ok(!pmChipReadHeader(chip, NULL), "pmChipReadHeader(chip, NULL) returned FALSE");
     268        ok(!pmChipReadHeader(chip, NULL, NULL), "pmChipReadHeader(chip, NULL) returned FALSE");
    269269        psFree(fpa);
    270270        psFree(camera);
    … …  
    278278        psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
    279279        ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
    280         ok(!pmChipReadHeader(NULL, fitsFileW), "pmChipReadHeader(NULL, fitsFile) returned FALSE");
     280        ok(!pmChipReadHeader(NULL, fitsFileW, NULL), "pmChipReadHeader(NULL, fitsFile) returned FALSE");
    281281        psFree(fitsFileW);
    282282        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    311311            }
    312312            ok(rc == true, "pmConfigFileRead() was successful");
    313             rc = pmHDUWrite(hdu, fitsFileW);
     313            rc = pmHDUWrite(hdu, fitsFileW, NULL);
    314314            ok(rc == true, "pmHDUWrite() successfully wrote the header");
    315315            psFree(hdu);
    … …  
    337337        }
    338338
    339         ok(pmChipReadHeader(chip, fitsFileR), "pmChipReadHeader() returned TRUE with acceptable data");
     339        ok(pmChipReadHeader(chip, fitsFileR, NULL), "pmChipReadHeader() returned TRUE with acceptable data");
    340340
    341341
    … …  
    362362        ok(chip != NULL, "Allocated a pmChip successfully");
    363363        ok(cell != NULL, "Allocated a pmCell successfully");
    364         ok(!pmFPAReadHeader(fpa, NULL), "pmFPAReadHeader(fpa, NULL) returned FALSE");
     364        ok(!pmFPAReadHeader(fpa, NULL, NULL), "pmFPAReadHeader(fpa, NULL) returned FALSE");
    365365        psFree(fpa);
    366366        psFree(camera);
    … …  
    374374        psFits* fitsFileW = psFitsOpen(fitsFilename, "w");
    375375        ok(fitsFileW != NULL, "psFitsOpen() opened the FITS file");
    376         ok(!pmFPAReadHeader(NULL, fitsFileW), "pmFPAReadHeader(NULL, fitsFile) returned FALSE");
     376        ok(!pmFPAReadHeader(NULL, fitsFileW, NULL), "pmFPAReadHeader(NULL, fitsFile) returned FALSE");
    377377        psFree(fitsFileW);
    378378        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    407407            }
    408408            ok(rc == true, "pmConfigFileRead() was successful");
    409             rc = pmHDUWrite(hdu, fitsFileW);
     409            rc = pmHDUWrite(hdu, fitsFileW, NULL);
    410410            ok(rc == true, "pmHDUWrite() successfully wrote the header");
    411411            psFree(hdu);
    … …  
    435435        fpa->hdu = pmHDUAlloc(extname);
    436436
    437         ok(pmFPAReadHeader(fpa, fitsFileR), "pmFPAReadHeader() returned TRUE with acceptable data");
     437        ok(pmFPAReadHeader(fpa, fitsFileR, NULL), "pmFPAReadHeader() returned TRUE with acceptable data");
    438438
    439439        // XXX: It's not clear if we should test if the HDU and pmConcepts actually

  • trunk/psModules/test/camera/tap_pmFPAMaskW.c

    r16008 r21220  
    152152pmFPA* generateSimpleFPA(psMetadata *camera)
    153153{
    154     pmFPA* fpa = pmFPAAlloc(camera);
     154    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    155155    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    156156    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/camera/tap_pmFPAUtils.c

    r16008 r21220  
    134134pmFPA* generateSimpleFPA(psMetadata *camera)
    135135{
    136     pmFPA* fpa = pmFPAAlloc(camera);
     136    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    137137    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    138138    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/camera/tap_pmFPAView.c

    r16008 r21220  
    146146pmFPA* generateSimpleFPA(psMetadata *camera)
    147147{
    148     pmFPA* fpa = pmFPAAlloc(camera);
     148    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    149149    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    150150    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();

  • trunk/psModules/test/camera/tap_pmHDU.c

    r15993 r21220  
    7373        psFree(header);
    7474        psFree(image);
    75         bool rc = pmHDUWrite(NULL, fitsFile);
     75        bool rc = pmHDUWrite(NULL, fitsFile, NULL);
    7676        ok(rc == false, "pmHDUWrite() returned FALSE with NULL psHDU as input");
    7777        psFitsClose(fitsFile);
    7878        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    7979    }
    80 
    8180
    8281    // Test pmHDUWrite() with NULL psFits input argument
    … …  
    9190        }
    9291        ok(rc == true, "pmConfigFileRead() was successful");
    93         rc = pmHDUWrite(hdu, NULL);
     92        rc = pmHDUWrite(hdu, NULL, NULL);
    9493        ok(rc == false, "pmHDUWrite() returned FALSE with NULL psFits file as input");
    9594        psFree(hdu);
    9695        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    9796    }
    98 
    9997
    10098    // Test pmHDURead() with NULL pmHDU input argument
    … …  
    157155        }
    158156        // 3. Use pmHDUWrite() to write that header to the FITS file
    159         rc = pmHDUWrite(hdu, fitsFileW);
     157        rc = pmHDUWrite(hdu, fitsFileW, NULL);
    160158        ok(rc == true, "pmHDUWrite() returned TRUE");
    161159        // 4. Close the FITS file, free memory
    … …  
    208206        psFree(header);
    209207        psFree(image);
    210         bool rc = pmHDUWriteWeight(NULL, fitsFile);
     208        bool rc = pmHDUWriteWeight(NULL, fitsFile, NULL);
    211209        ok(rc == false, "pmHDUWriteWeight() returned FALSE with NULL psHDU as input");
    212210        psFitsClose(fitsFile);
    … …  
    226224        }
    227225        ok(rc == true, "pmConfigFileRead() was successful");
    228         rc = pmHDUWriteWeight(hdu, NULL);
     226        rc = pmHDUWriteWeight(hdu, NULL, NULL);
    229227        ok(rc == false, "pmHDUWriteWeight    () returned FALSE with NULL psFits file as input");
    230228        psFree(hdu);
    … …  
    292290        }
    293291        // 3. Use pmHDUWriteWeight() to write that header to the FITS file
    294         rc = pmHDUWriteWeight(hdu, fitsFileW);
     292        rc = pmHDUWriteWeight(hdu, fitsFileW, NULL);
    295293        ok(rc == true, "pmHDUWriteWeight() returned TRUE");
    296294        // 4. Close the FITS file, free memory
    … …  
    343341        psFree(header);
    344342        psFree(image);
    345         bool rc = pmHDUWriteMask(NULL, fitsFile);
     343        bool rc = pmHDUWriteMask(NULL, fitsFile, NULL);
    346344        ok(rc == false, "pmHDUWriteMask() returned FALSE with NULL psHDU as input");
    347345        psFitsClose(fitsFile);
    … …  
    361359        }
    362360        ok(rc == true, "pmConfigFileRead() was successful");
    363         rc = pmHDUWriteMask(hdu, NULL);
     361        rc = pmHDUWriteMask(hdu, NULL, NULL);
    364362        ok(rc == false, "pmHDUWriteMask() returned FALSE with NULL psFits file as input");
    365363        psFree(hdu);
    … …  
    427425        }
    428426        // 3. Use pmHDUWriteMask() to write that header to the FITS file
    429         rc = pmHDUWriteMask(hdu, fitsFileW);
     427        rc = pmHDUWriteMask(hdu, fitsFileW, NULL);
    430428        ok(rc == true, "pmHDUWriteMask() returned TRUE");
    431429        // 4. Close the FITS file, free memory
    … …  
    520518            }
    521519            ok(rc == true, "pmConfigFileRead() was successful");
    522             rc = pmHDUWrite(hdu, fitsFileW);
     520            rc = pmHDUWrite(hdu, fitsFileW, NULL);
    523521            ok(rc == true, "pmHDUWrite() successfully wrote the header");
    524522            psFree(hdu);

  • trunk/psModules/test/camera/tap_pmHDUUtils.c

    r16008 r21220  
    143143pmFPA* generateSimpleFPA(psMetadata *camera)
    144144{
    145     pmFPA* fpa = pmFPAAlloc(camera);
     145    pmFPA* fpa = pmFPAAlloc(camera, NULL);
    146146    fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
    147147    fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
Note: See TracChangeset for help on using the changeset viewer.