IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 24, 2006, 2:29:31 PM (20 years ago)
Author:
Paul Price
Message:

Changed definition of psArrayAlloc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/icd-demo/src/icd-test.c

    r9127 r9741  
    77
    88    if (argc != 3) {
    9         fprintf (stderr, "USAGE: icd-demo (input) (output)\n");
    10         exit (2);
     9        fprintf (stderr, "USAGE: icd-demo (input) (output)\n");
     10        exit (2);
    1111    }
    1212
    … …  
    1515
    1616    {
    17         psMetadata *header  = psMetadataAlloc ();
    18         psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank");
    19         psFitsWriteBlank (fits, header, "blank");
     17        psMetadata *header  = psMetadataAlloc ();
     18        psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank");
     19        psFitsWriteBlank (fits, header, "blank");
    2020    }
    2121
    2222    {
    23         psMetadata *header  = psMetadataAlloc ();
    24         psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank1");
    25         psFitsWriteBlank (fits, header, "blank1");
     23        psMetadata *header  = psMetadataAlloc ();
     24        psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank1");
     25        psFitsWriteBlank (fits, header, "blank1");
    2626    }
    2727
    2828    {
    29         psMetadata *header  = psMetadataAlloc ();
    30         psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "table1");
     29        psMetadata *header  = psMetadataAlloc ();
     30        psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "table1");
    3131
    32         psArray *table = psArrayAlloc (100);
    33         for (int i = 0; i < 10; i++) {
    34        
    35             psMetadata *row = psMetadataAlloc ();
    36             psMetadataAdd (row, PS_LIST_TAIL, "N", PS_DATA_S16, "", i);
    37             psMetadataAdd (row, PS_LIST_TAIL, "F", PS_DATA_F32, "", i*0.2);
    38             psMetadataAdd (row, PS_LIST_TAIL, "G", PS_DATA_F32, "", i*0.5);
    39             psArrayAdd (table, 100, row);
    40             psFree (row);
    41         }
     32        psArray *table = psArrayAllocEmpty (100);
     33        for (int i = 0; i < 10; i++) {
    4234
    43         psFitsInsertTable (fits, header, table, "table1", true);
     35            psMetadata *row = psMetadataAlloc ();
     36            psMetadataAdd (row, PS_LIST_TAIL, "N", PS_DATA_S16, "", i);
     37            psMetadataAdd (row, PS_LIST_TAIL, "F", PS_DATA_F32, "", i*0.2);
     38            psMetadataAdd (row, PS_LIST_TAIL, "G", PS_DATA_F32, "", i*0.5);
     39            psArrayAdd (table, 100, row);
     40            psFree (row);
     41        }
     42
     43        psFitsInsertTable (fits, header, table, "table1", true);
    4444    }
    4545
    4646    {
    47         psMetadata *header  = psMetadataAlloc ();
    48         psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank2");
    49         psFitsWriteBlank (fits, header, "blank2");
     47        psMetadata *header  = psMetadataAlloc ();
     48        psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "blank2");
     49        psFitsWriteBlank (fits, header, "blank2");
    5050    }
    5151
    5252    {
    53         psMetadata *header  = psMetadataAlloc ();
    54         psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "table2");
     53        psMetadata *header  = psMetadataAlloc ();
     54        psMetadataAddStr (header, PS_LIST_HEAD, "EXTID", 0, "", "table2");
    5555
    56         psArray *table = psArrayAlloc (100);
    57         for (int i = 0; i < 10; i++) {
    58        
    59             psMetadata *row = psMetadataAlloc ();
    60             psMetadataAdd (row, PS_LIST_TAIL, "N", PS_DATA_S16, "", i);
    61             psMetadataAdd (row, PS_LIST_TAIL, "F", PS_DATA_F32, "", i*0.2);
    62             psMetadataAdd (row, PS_LIST_TAIL, "G", PS_DATA_F32, "", i*0.5);
    63             psArrayAdd (table, 100, row);
    64             psFree (row);
    65         }
     56        psArray *table = psArrayAllocEmpty (100);
     57        for (int i = 0; i < 10; i++) {
    6658
    67         psFitsInsertTable (fits, header, table, "table2", true);
     59            psMetadata *row = psMetadataAlloc ();
     60            psMetadataAdd (row, PS_LIST_TAIL, "N", PS_DATA_S16, "", i);
     61            psMetadataAdd (row, PS_LIST_TAIL, "F", PS_DATA_F32, "", i*0.2);
     62            psMetadataAdd (row, PS_LIST_TAIL, "G", PS_DATA_F32, "", i*0.5);
     63            psArrayAdd (table, 100, row);
     64            psFree (row);
     65        }
     66
     67        psFitsInsertTable (fits, header, table, "table2", true);
    6868    }
    6969
Note: See TracChangeset for help on using the changeset viewer.