Changeset 4308 for trunk/psLib/src
- Timestamp:
- Jun 17, 2005, 1:44:22 PM (21 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 17 edited
-
astronomy/psAstrometry.c (modified) (4 diffs)
-
collections/psMetadata.c (modified) (3 diffs)
-
dataIO/psFits.c (modified) (2 diffs)
-
dataIO/psFits.h (modified) (2 diffs)
-
dataIO/psLookupTable.c (modified) (2 diffs)
-
fits/psFits.c (modified) (2 diffs)
-
fits/psFits.h (modified) (2 diffs)
-
image/psImageGeomManip.c (modified) (2 diffs)
-
imageops/psImageGeomManip.c (modified) (2 diffs)
-
sys/psErrorCodes.c (modified) (3 diffs)
-
sys/psMemory.h (modified) (2 diffs)
-
sys/psTrace.c (modified) (2 diffs)
-
sysUtils/psErrorCodes.c (modified) (3 diffs)
-
sysUtils/psMemory.h (modified) (2 diffs)
-
sysUtils/psTrace.c (modified) (2 diffs)
-
types/psLookupTable.c (modified) (2 diffs)
-
types/psMetadata.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psAstrometry.c
r4143 r4308 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.6 8$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-06- 08 00:26:01 $10 * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-06-17 23:44:21 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 55 55 psFree(fpa->chips); 56 56 psFree(fpa->grommit); 57 psFree( (psExposure*)fpa->exposure);57 psFree(fpa->exposure); 58 58 psFree(fpa->metadata); 59 59 psFree(fpa->fromTangentPlane); … … 102 102 { 103 103 if (obs != NULL) { 104 psFree( (psPtr)obs->name);104 psFree(obs->name); 105 105 } 106 106 } … … 109 109 { 110 110 if (exp != NULL) { 111 psFree( (psPtr)exp->time);112 psFree( (psPtr)exp->observatory);113 psFree( (psPtr)exp->cameraName);114 psFree( (psPtr)exp->telescopeName);111 psFree(exp->time); 112 psFree(exp->observatory); 113 psFree(exp->cameraName); 114 psFree(exp->telescopeName); 115 115 } 116 116 } -
trunk/psLib/src/collections/psMetadata.c
r4094 r4308 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.6 4$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06- 03 02:07:51 $14 * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-17 23:44:21 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 89 89 90 90 psHashAdd(table, key, item); // put in the new entry 91 psMemDecrRefCounter(item); // get rid of extra reference 91 92 92 93 // free local references of newly allocated items. 93 94 psFree(newList); 94 psFree(item);95 95 96 96 return item; … … 107 107 } 108 108 109 ps Free(metadataItem->name);110 ps Free(metadataItem->comment);109 psMemDecrRefCounter(metadataItem->name); 110 psMemDecrRefCounter(metadataItem->comment); 111 111 112 112 if(!PS_META_IS_PRIMITIVE(type)) { -
trunk/psLib/src/dataIO/psFits.c
r4193 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.3 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 09 21:17:45$9 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 203 203 if (fits != NULL) { 204 204 (void)fits_close_file(fits->p_fd, &status); 205 psFree( (void*)fits->filename);205 psFree(fits->filename); 206 206 } 207 207 } -
trunk/psLib/src/dataIO/psFits.h
r4214 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-1 1 02:19:05$9 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 33 33 */ 34 34 typedef enum { 35 PS_FITS_TYPE_NONE = -1, ///< Unknown HDU type36 PS_FITS_TYPE_IMAGE = IMAGE_HDU, ///< Image HDU type37 PS_FITS_TYPE_BINARY_TABLE = BINARY_TBL, 38 PS_FITS_TYPE_ASCII_TABLE = ASCII_TBL, ///< ASCII table HDU type39 PS_FITS_TYPE_ANY = ANY_HDU ///< Any HDU type35 PS_FITS_TYPE_NONE = -1, ///< Unknown HDU type 36 PS_FITS_TYPE_IMAGE = IMAGE_HDU, ///< Image HDU type 37 PS_FITS_TYPE_BINARY_TABLE = BINARY_TBL, ///< Binary table HDU type 38 PS_FITS_TYPE_ASCII_TABLE = ASCII_TBL, ///< ASCII table HDU type 39 PS_FITS_TYPE_ANY = ANY_HDU ///< Any HDU type 40 40 } psFitsType; 41 41 -
trunk/psLib/src/dataIO/psLookupTable.c
r4167 r4308 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 09 00:56:37$9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii … … 246 246 247 247 psFree(table->values); 248 psFree( (char*)table->filename);249 psFree( (char*)table->format);248 psFree(table->filename); 249 psFree(table->format); 250 250 } 251 251 -
trunk/psLib/src/fits/psFits.c
r4193 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.3 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 09 21:17:45$9 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 203 203 if (fits != NULL) { 204 204 (void)fits_close_file(fits->p_fd, &status); 205 psFree( (void*)fits->filename);205 psFree(fits->filename); 206 206 } 207 207 } -
trunk/psLib/src/fits/psFits.h
r4214 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-1 1 02:19:05$9 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 33 33 */ 34 34 typedef enum { 35 PS_FITS_TYPE_NONE = -1, ///< Unknown HDU type36 PS_FITS_TYPE_IMAGE = IMAGE_HDU, ///< Image HDU type37 PS_FITS_TYPE_BINARY_TABLE = BINARY_TBL, 38 PS_FITS_TYPE_ASCII_TABLE = ASCII_TBL, ///< ASCII table HDU type39 PS_FITS_TYPE_ANY = ANY_HDU ///< Any HDU type35 PS_FITS_TYPE_NONE = -1, ///< Unknown HDU type 36 PS_FITS_TYPE_IMAGE = IMAGE_HDU, ///< Image HDU type 37 PS_FITS_TYPE_BINARY_TABLE = BINARY_TBL, ///< Binary table HDU type 38 PS_FITS_TYPE_ASCII_TABLE = ASCII_TBL, ///< ASCII table HDU type 39 PS_FITS_TYPE_ANY = ANY_HDU ///< Any HDU type 40 40 } psFitsType; 41 41 -
trunk/psLib/src/image/psImageGeomManip.c
r4287 r4308 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-06-1 6 22:07:41 $12 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-17 23:44:21 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 865 865 } 866 866 867 psFree(inPosition); 868 867 869 return output; 868 870 } -
trunk/psLib/src/imageops/psImageGeomManip.c
r4287 r4308 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-06-1 6 22:07:41 $12 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-17 23:44:21 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 865 865 } 866 866 867 psFree(inPosition); 868 867 869 return output; 868 870 } -
trunk/psLib/src/sys/psErrorCodes.c
r3682 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 4-07 20:27:41 $9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 29 29 * $2 The error description (rest of the line in psErrorCodes.dat) 30 30 * $n The order of the source line in psErrorCodes.dat (comments excluded) 31 * 31 * 32 32 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. 33 33 */ … … 90 90 static void freeErrorDescription(psErrorDescription* err) 91 91 { 92 psFree( (psPtr)err->description);92 psFree(err->description); 93 93 } 94 94 -
trunk/psLib/src/sys/psMemory.h
r4298 r4308 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.3 8$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-17 2 1:42:02$14 * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-17 23:44:21 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 239 239 /// Free memory. psFree sends file and line number to p_psFree. 240 240 #ifndef SWIG 241 #define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)241 #define psFree(ptr) { p_psFree((psPtr)ptr, __FILE__, __LINE__); *(void**)&ptr = NULL; } 242 242 #endif // ! SWIG 243 243 -
trunk/psLib/src/sys/psTrace.c
r4162 r4308 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1. 49$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-06- 08 23:40:45$11 * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-17 23:44:21 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 97 97 98 98 p_psMemSetPersistent((psPtr)comp->name,false); 99 psFree( (psPtr)comp->name);99 psFree(comp->name); 100 100 } 101 101 -
trunk/psLib/src/sysUtils/psErrorCodes.c
r3682 r4308 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 4-07 20:27:41 $9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 29 29 * $2 The error description (rest of the line in psErrorCodes.dat) 30 30 * $n The order of the source line in psErrorCodes.dat (comments excluded) 31 * 31 * 32 32 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. 33 33 */ … … 90 90 static void freeErrorDescription(psErrorDescription* err) 91 91 { 92 psFree( (psPtr)err->description);92 psFree(err->description); 93 93 } 94 94 -
trunk/psLib/src/sysUtils/psMemory.h
r4298 r4308 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.3 8$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-17 2 1:42:02$14 * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-17 23:44:21 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 239 239 /// Free memory. psFree sends file and line number to p_psFree. 240 240 #ifndef SWIG 241 #define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)241 #define psFree(ptr) { p_psFree((psPtr)ptr, __FILE__, __LINE__); *(void**)&ptr = NULL; } 242 242 #endif // ! SWIG 243 243 -
trunk/psLib/src/sysUtils/psTrace.c
r4162 r4308 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1. 49$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-06- 08 23:40:45$11 * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-17 23:44:21 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 97 97 98 98 p_psMemSetPersistent((psPtr)comp->name,false); 99 psFree( (psPtr)comp->name);99 psFree(comp->name); 100 100 } 101 101 -
trunk/psLib/src/types/psLookupTable.c
r4167 r4308 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 09 00:56:37$9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-17 23:44:21 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii … … 246 246 247 247 psFree(table->values); 248 psFree( (char*)table->filename);249 psFree( (char*)table->format);248 psFree(table->filename); 249 psFree(table->format); 250 250 } 251 251 -
trunk/psLib/src/types/psMetadata.c
r4094 r4308 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.6 4$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06- 03 02:07:51 $14 * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-17 23:44:21 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 89 89 90 90 psHashAdd(table, key, item); // put in the new entry 91 psMemDecrRefCounter(item); // get rid of extra reference 91 92 92 93 // free local references of newly allocated items. 93 94 psFree(newList); 94 psFree(item);95 95 96 96 return item; … … 107 107 } 108 108 109 ps Free(metadataItem->name);110 ps Free(metadataItem->comment);109 psMemDecrRefCounter(metadataItem->name); 110 psMemDecrRefCounter(metadataItem->comment); 111 111 112 112 if(!PS_META_IS_PRIMITIVE(type)) {
Note:
See TracChangeset
for help on using the changeset viewer.
