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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.