Changeset 4321 for trunk/psLib/src/types
- Timestamp:
- Jun 20, 2005, 12:42:30 PM (21 years ago)
- Location:
- trunk/psLib/src/types
- Files:
-
- 6 edited
-
psLookupTable.c (modified) (3 diffs)
-
psLookupTable.h (modified) (3 diffs)
-
psMetadata.c (modified) (8 diffs)
-
psMetadata.h (modified) (17 diffs)
-
psPixels.c (modified) (3 diffs)
-
psPixels.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/types/psLookupTable.c
r4308 r4321 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 8$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 17 23:44:21$9 * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-20 22:42:29 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii … … 254 254 /*****************************************************************************/ 255 255 256 psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, intindexCol)256 psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, long indexCol) 257 257 { 258 258 psLookupTable *outTable = NULL; … … 633 633 } 634 634 635 psS32psLookupTableRead(psLookupTable* table)635 long psLookupTableRead(psLookupTable* table) 636 636 { 637 637 psS32 numRows = 0; -
trunk/psLib/src/types/psLookupTable.h
r4162 r4321 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 08 23:40:45$9 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-20 22:42:29 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 70 70 const char *fileName, ///< Name of file to read 71 71 const char *format, ///< scanf-like format string 72 intindexCol ///< Column of the index vector (starting at zero)72 long indexCol ///< Column of the index vector (starting at zero) 73 73 ); 74 74 … … 102 102 * @return psS32 Number of valid lines read 103 103 */ 104 psS32psLookupTableRead(104 long psLookupTableRead( 105 105 psLookupTable *table ///< Table to read 106 106 ); -
trunk/psLib/src/types/psMetadata.c
r4308 r4321 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.6 5$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06- 17 23:44:21$14 * @version $Revision: 1.66 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-20 22:42:29 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 267 267 } 268 268 269 psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)269 bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags) 270 270 { 271 271 char * key = NULL; … … 359 359 } 360 360 361 psBool psMetadataAdd(psMetadata *md, psS32location, const char *name,362 psS32 type, const char *comment, ...)361 bool psMetadataAdd(psMetadata *md, int location, const char *name, 362 int format, const char *comment, ...) 363 363 { 364 364 va_list argPtr; 365 365 366 366 va_start(argPtr, comment); 367 psBool result = psMetadataAddV(md,location,name, type,comment,argPtr);367 psBool result = psMetadataAddV(md,location,name,format,comment,argPtr); 368 368 va_end(argPtr); 369 369 … … 371 371 } 372 372 373 psBool psMetadataAddV(psMetadata *md, psS32location, const char *name,374 psS32 type, const char *comment, va_list list)373 bool psMetadataAddV(psMetadata *md, int location, const char *name, 374 int format, const char *comment, va_list list) 375 375 { 376 376 psMetadataItem* metadataItem = NULL; 377 377 378 metadataItem = psMetadataItemAllocV(name, type& PS_METADATA_TYPE_MASK, comment, list);379 380 if (!psMetadataAddItem(md, metadataItem, location, type& PS_METADATA_FLAGS_MASK)) {378 metadataItem = psMetadataItemAllocV(name, format & PS_METADATA_TYPE_MASK, comment, list); 379 380 if (!psMetadataAddItem(md, metadataItem, location, format & PS_METADATA_FLAGS_MASK)) { 381 381 psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_FAILED); 382 382 psFree(metadataItem); … … 475 475 } 476 476 477 psMetadataItem* psMetadataLookup( psMetadata *md, const char *key)477 psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key) 478 478 { 479 479 psHash* mdTable = NULL; … … 491 491 } 492 492 493 void* psMetadataLookupPtr( psBool *status,psMetadata *md, const char *key)493 void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key) 494 494 { 495 495 psMetadataItem *metadataItem = NULL; … … 525 525 526 526 #define psMetadataLookupNumTYPE(TYPE) \ 527 ps##TYPE psMetadataLookup##TYPE( psBool *status,psMetadata *md, const char *key) \527 ps##TYPE psMetadataLookup##TYPE(bool *status, const psMetadata *md, const char *key) \ 528 528 { \ 529 529 psMetadataItem *metadataItem = NULL; \ … … 630 630 } 631 631 632 psBool psMetadataIteratorSet(psMetadataIterator* iterator,633 632 bool psMetadataIteratorSet(psMetadataIterator* iterator, 633 int location) 634 634 { 635 635 int match; -
trunk/psLib/src/types/psMetadata.h
r4243 r4321 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-06- 14 02:54:06$13 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-20 22:42:29 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 214 214 const char* name, ///< Name of metadata item. 215 215 const char* comment, ///< Comment for metadata item. 216 psBool value ///< the value of the metadata item.216 bool value ///< the value of the metadata item. 217 217 ); 218 218 … … 257 257 * @return bool: True for success, false for failure. 258 258 */ 259 psBool psMetadataAddItem(259 bool psMetadataAddItem( 260 260 psMetadata* md, ///< Metadata collection to insert metadat item. 261 261 psMetadataItem* item, ///< Metadata item to be added. … … 270 270 * @return bool: True for success, false for failure. 271 271 */ 272 psBool psMetadataAdd(272 bool psMetadataAdd( 273 273 psMetadata* md, ///< Metadata collection to insert metadata item. 274 psS32 location,///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL274 int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL 275 275 const char *name, ///< Name of metadata item. 276 int type,///< Type of metadata item (psMetadataType) and options (psMetadataFlags)276 int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) 277 277 const char *comment, ///< Comment for metadata item. 278 278 ... ///< Arguments for name formatting and metadata item data. … … 286 286 * @return bool: True for success, false for failure. 287 287 */ 288 psBool psMetadataAddV(288 bool psMetadataAddV( 289 289 psMetadata* md, ///< Metadata collection to insert metadata item. 290 psS32 location,///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL290 int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL 291 291 const char *name, ///< Name of metadata item. 292 int type,///< Type of metadata item (psMetadataType) and options (psMetadataFlags)292 int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) 293 293 const char *comment, ///< Comment for metadata item. 294 294 va_list list ///< Arguments for name formatting and metadata item data. … … 300 300 * @return psBool: True for success, False for failure. 301 301 */ 302 psBool psMetadataAddS32(302 bool psMetadataAddS32( 303 303 psMetadata* md, ///< Metadata collection to insert metadata item 304 304 psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 312 312 * @return psBool: True for success, False for failure. 313 313 */ 314 psBool psMetadataAddF32(314 bool psMetadataAddF32( 315 315 psMetadata* md, ///< Metadata collection to insert metadata item 316 316 psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 324 324 * @return psBool: True for success, False for failure. 325 325 */ 326 psBool psMetadataAddF64(326 bool psMetadataAddF64( 327 327 psMetadata* md, ///< Metadata collection to insert metadata item 328 328 psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 348 348 * @return psBool: True for success, False for failure. 349 349 */ 350 psBool psMetadataAddStr(350 bool psMetadataAddStr( 351 351 psMetadata* md, ///< Metadata collection to insert metadata item 352 352 psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL … … 438 438 * @return bool: True for success, false for failure. 439 439 */ 440 psBool psMetadataRemove(441 psMetadata* md, ///< Metadata collection to remove metadata item.442 psS32 where,///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL443 const char * key ///< Name of metadata key.440 bool psMetadataRemove( 441 psMetadata* md, ///< Metadata collection to remove metadata item. 442 int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL 443 const char * key ///< Name of metadata key. 444 444 ); 445 445 … … 453 453 */ 454 454 psMetadataItem* psMetadataLookup( 455 psMetadata * md, ///< Metadata collection to lookup metadata item.455 const psMetadata * md, ///< Metadata collection to lookup metadata item. 456 456 const char * key ///< Name of metadata key. 457 457 ); … … 466 466 */ 467 467 psF64 psMetadataLookupF64( 468 psBool *status, ///< Status of lookup.469 psMetadata *md, ///< Metadata collection to lookup metadata item.468 bool *status, ///< Status of lookup. 469 const psMetadata *md, ///< Metadata collection to lookup metadata item. 470 470 const char *key ///< Name of metadata key. 471 471 ); … … 480 480 */ 481 481 psF32 psMetadataLookupF32( 482 psBool *status, ///< Status of lookup.483 psMetadata *md, ///< Metadata collection to lookup metadata item.482 bool *status, ///< Status of lookup. 483 const psMetadata *md, ///< Metadata collection to lookup metadata item. 484 484 const char *key ///< Name of metadata key. 485 485 ); … … 494 494 */ 495 495 psS32 psMetadataLookupS32( 496 psBool *status, ///< Status of lookup.497 psMetadata *md, ///< Metadata collection to lookup metadata item.496 bool *status, ///< Status of lookup. 497 const psMetadata *md, ///< Metadata collection to lookup metadata item. 498 498 const char *key ///< Name of metadata key. 499 499 ); … … 508 508 */ 509 509 psBool psMetadataLookupBool( 510 psBool *status, ///< Status of lookup.511 psMetadata *md, ///< Metadata collection to lookup metadata item.510 bool *status, ///< Status of lookup. 511 const psMetadata *md, ///< Metadata collection to lookup metadata item. 512 512 const char *key ///< Name of metadata key. 513 513 ); … … 522 522 */ 523 523 psPtr psMetadataLookupPtr( 524 psBool *status, ///< Status of lookup.525 psMetadata* md, ///< Metadata collection to lookup metadata item.524 bool *status, ///< Status of lookup. 525 const psMetadata* md, ///< Metadata collection to lookup metadata item. 526 526 const char *key ///< Name of metadata key. 527 527 ); … … 560 560 * @return psBool TRUE if iterator successfully set, otherwise FALSE. 561 561 */ 562 psBool psMetadataIteratorSet(562 bool psMetadataIteratorSet( 563 563 psMetadataIterator* iterator, ///< psMetadata iterator 564 564 int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL -
trunk/psLib/src/types/psPixels.c
r4230 r4321 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 13 20:43:40$9 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-20 22:42:29 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 114 114 } 115 115 116 psPixels* psPixelsCopy(psPixels* out, const psPixels* in)117 { 118 if ( in== NULL) {116 psPixels* psPixelsCopy(psPixels* out, const psPixels* pixels) 117 { 118 if (pixels == NULL) { 119 119 psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psPixels_NULL); 120 120 psFree(out); … … 122 122 } 123 123 124 out = psPixelsRealloc(out, in->n);125 126 memcpy(out->data, in->data, in->n*sizeof(psPixelCoord));127 out->n = in->n;124 out = psPixelsRealloc(out, pixels->n); 125 126 memcpy(out->data,pixels->data, pixels->n*sizeof(psPixelCoord)); 127 out->n = pixels->n; 128 128 129 129 return out; -
trunk/psLib/src/types/psPixels.h
r4293 r4321 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06- 17 00:11:02$9 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-20 22:42:29 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 85 85 psPixels* psPixelsCopy( 86 86 psPixels* out, ///< psPixels struct to recycle, or NULL 87 const psPixels* in///< psPixels struct to copy87 const psPixels* pixels ///< psPixels struct to copy 88 88 ); 89 89
Note:
See TracChangeset
for help on using the changeset viewer.
