IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3298


Ignore:
Timestamp:
Feb 22, 2005, 9:25:53 AM (21 years ago)
Author:
desonia
Message:

fixed multiple small bugs, including bug 302.

Location:
trunk/psLib
Files:
12 added
12 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/pslib.kdevses

    r3246 r3298  
    22<!DOCTYPE KDevPrjSession>
    33<KDevPrjSession>
    4  <DocsAndViews NumberOfDocuments="0" />
     4 <DocsAndViews NumberOfDocuments="6" >
     5  <Doc0 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/src/astronomy/psMetadata.c" >
     6   <View0 line="342" Type="Source" />
     7  </Doc0>
     8  <Doc1 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/test/fileUtils/tst_psFits.c" >
     9   <View0 line="193" Type="Source" />
     10  </Doc1>
     11  <Doc2 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/src/collections/psHash.c" >
     12   <View0 line="290" Type="Source" />
     13  </Doc2>
     14  <Doc3 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/src/fileUtils/psFits.c" >
     15   <View0 line="1471" Type="Source" />
     16  </Doc3>
     17  <Doc4 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/src/sysUtils/psMemory.h" >
     18   <View0 line="397" Type="Source" />
     19  </Doc4>
     20  <Doc5 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/src/collections/psArray.c" >
     21   <View0 line="0" Type="Source" />
     22  </Doc5>
     23 </DocsAndViews>
    524 <pluginList>
    625  <kdevbookmarks>

  • trunk/psLib/src/collections/psBitSet.c

    r3264 r3298  
    1111 *  @author Robert DeSonia, MHPCC
    1212 *
    13  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:23 $
     13 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-02-22 19:25:52 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    186186        return NULL;
    187187    }
    188 
    189     // make operator all caps
    190     psS32 tempStrLen = strlen(operator);
    191     char* tempStr = psAlloc(tempStrLen+1);
    192 
    193     for (psS32 lcv=0;lcv<tempStrLen;lcv++) {
    194         tempStr[lcv] = (char)toupper(operator[lcv]);
    195     }
    196     tempStr[tempStrLen] = '\0';
    197188
    198189    // parse the operator
    … …  
    206197        op = NOT_OP;
    207198    } else {
    208         psFree(tempStr);
    209199        psFree(outBitSet);
    210200        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    … …  
    213203        return NULL;
    214204    }
    215     psFree(tempStr);
    216205
    217206    if (op != NOT_OP) {

  • trunk/psLib/src/dataIO/psFits.c

    r3264 r3298  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-02-22 19:25:52 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    14961496                    }
    14971497                    if (! found) {
    1498                         psArrayAdd(columns, columns->nalloc, psMemIncrRefCounter(item));
     1498                        psArrayAdd(columns, columns->nalloc, item);
    14991499                    }
    15001500                }

  • trunk/psLib/src/fileUtils/psFits.c

    r3264 r3298  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-02-22 19:25:52 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    14961496                    }
    14971497                    if (! found) {
    1498                         psArrayAdd(columns, columns->nalloc, psMemIncrRefCounter(item));
     1498                        psArrayAdd(columns, columns->nalloc, item);
    14991499                    }
    15001500                }

  • trunk/psLib/src/fits/psFits.c

    r3264 r3298  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-02-22 19:25:52 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    14961496                    }
    14971497                    if (! found) {
    1498                         psArrayAdd(columns, columns->nalloc, psMemIncrRefCounter(item));
     1498                        psArrayAdd(columns, columns->nalloc, item);
    14991499                    }
    15001500                }

  • trunk/psLib/src/types/psBitSet.c

    r3264 r3298  
    1111 *  @author Robert DeSonia, MHPCC
    1212 *
    13  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:23 $
     13 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-02-22 19:25:52 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    186186        return NULL;
    187187    }
    188 
    189     // make operator all caps
    190     psS32 tempStrLen = strlen(operator);
    191     char* tempStr = psAlloc(tempStrLen+1);
    192 
    193     for (psS32 lcv=0;lcv<tempStrLen;lcv++) {
    194         tempStr[lcv] = (char)toupper(operator[lcv]);
    195     }
    196     tempStr[tempStrLen] = '\0';
    197188
    198189    // parse the operator
    … …  
    206197        op = NOT_OP;
    207198    } else {
    208         psFree(tempStr);
    209199        psFree(outBitSet);
    210200        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    … …  
    213203        return NULL;
    214204    }
    215     psFree(tempStr);
    216205
    217206    if (op != NOT_OP) {

  • trunk/psLib/test/dataIO/Makefile.am

    r3275 r3298  
    2222check_PROGRAMS = $(TESTS)
    2323
     24check_DATA = table10.dat table2.dat table3.dat tableF32.dat tableS32.dat tableU8.dat
     25
    2426TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2527tests: $(TESTS)
    … …  
    2729tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
    2830tst_psFits_SOURCES =  tst_psFits.c
     31
     32%.dat: verified/%.dat
     33        cp $? $@
     34

  • trunk/psLib/test/dataIO/tst_psFits.c

    r3286 r3298  
    66*  @author Robert DeSonia, MHPCC
    77*
    8 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    9 *  @date $Date: 2005-02-18 22:17:20 $
     8*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     9*  @date $Date: 2005-02-22 19:25:53 $
    1010*
    1111*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    161161        header = psMetadataAlloc();
    162162
    163         int id = psMemGetId();
    164163        psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
    165164                      PS_TYPE_S32, PS_META_PRIMITIVE,
    166165                      "psS32 Item", (psS32)row);
    167166
    168         fprintf(stderr,"ref=%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data), id);
    169 
    170         id = psMemGetId();
    171167        psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
    172168                      PS_TYPE_F32, PS_META_PRIMITIVE,
    173169                      "psF32 Item", (float)(1.0f/(float)(1+row)));
    174170
    175         fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id);
    176 
    177         id = psMemGetId();
    178171        psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
    179172                      PS_TYPE_F64, PS_META_PRIMITIVE,
    180173                      "psF64 Item", (double)(1.0/(double)(1+row)));
    181174
    182         fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id);
    183 
    184         id = psMemGetId();
    185175        psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
    186176                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
    … …  
    188178                      (row%2 == 0));
    189179
    190         fprintf(stderr,"%d(%d)\n",(int)psMemGetRefCounter(header->list->tail->data),id);
    191 
    192180        table->data[row] = header;
    193181    }
    … …  
    198186    psFree(fitsFile);
    199187
    200     psMemCheckLeaks(15,NULL,stderr,false);
    201 
    202     return true;
     188    return ! psMemCheckLeaks(15,NULL,stderr,false);
    203189}
    204190

  • trunk/psLib/test/fileUtils/Makefile.am

    r3275 r3298  
    2222check_PROGRAMS = $(TESTS)
    2323
     24check_DATA = table10.dat table2.dat table3.dat tableF32.dat tableS32.dat tableU8.dat
     25
    2426TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2527tests: $(TESTS)
    … …  
    2729tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
    2830tst_psFits_SOURCES =  tst_psFits.c
     31
     32%.dat: verified/%.dat
     33        cp $? $@
     34

  • trunk/psLib/test/fileUtils/tst_psFits.c

    r3286 r3298  
    66*  @author Robert DeSonia, MHPCC
    77*
    8 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    9 *  @date $Date: 2005-02-18 22:17:20 $
     8*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     9*  @date $Date: 2005-02-22 19:25:53 $
    1010*
    1111*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    161161        header = psMetadataAlloc();
    162162
    163         int id = psMemGetId();
    164163        psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
    165164                      PS_TYPE_S32, PS_META_PRIMITIVE,
    166165                      "psS32 Item", (psS32)row);
    167166
    168         fprintf(stderr,"ref=%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data), id);
    169 
    170         id = psMemGetId();
    171167        psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
    172168                      PS_TYPE_F32, PS_META_PRIMITIVE,
    173169                      "psF32 Item", (float)(1.0f/(float)(1+row)));
    174170
    175         fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id);
    176 
    177         id = psMemGetId();
    178171        psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
    179172                      PS_TYPE_F64, PS_META_PRIMITIVE,
    180173                      "psF64 Item", (double)(1.0/(double)(1+row)));
    181174
    182         fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id);
    183 
    184         id = psMemGetId();
    185175        psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
    186176                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
    … …  
    188178                      (row%2 == 0));
    189179
    190         fprintf(stderr,"%d(%d)\n",(int)psMemGetRefCounter(header->list->tail->data),id);
    191 
    192180        table->data[row] = header;
    193181    }
    … …  
    198186    psFree(fitsFile);
    199187
    200     psMemCheckLeaks(15,NULL,stderr,false);
    201 
    202     return true;
     188    return ! psMemCheckLeaks(15,NULL,stderr,false);
    203189}
    204190

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

    r3264 r3298  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:25 $
     8 *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-02-22 19:25:53 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    13561356
    13571357        // now, let's compare this with the verified file
    1358         fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"fOut.fits");
    1359         sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"sOut.fits");
    1360         fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"fBiOut.fits");
    1361         sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"sBiOut.fits");
     1358        fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"temp/fOut.fits");
     1359        sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"temp/sOut.fits");
     1360        fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"temp/fBiOut.fits");
     1361        sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"temp/sBiOut.fits");
    13621362        if (fTruth == NULL) {
    13631363            psError(PS_ERR_UNKNOWN, true,"verified psF32 image failed to be read (%d deg. rotation)",
Note: See TracChangeset for help on using the changeset viewer.