Changeset 15973 for trunk/psModules/src/camera/pmFPA.c
- Timestamp:
- Jan 2, 2008, 10:33:41 AM (18 years ago)
- File:
-
- 1 edited
-
trunk/psModules/src/camera/pmFPA.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules/src/camera/pmFPA.c
r14933 r15973 271 271 } 272 272 273 bool psMemCheckReadout(psPtr ptr) 274 { 275 PS_ASSERT_PTR(ptr, false); 276 return ( psMemGetDeallocator(ptr) == (psFreeFunc) readoutFree); 277 } 278 279 273 280 pmCell *pmCellAlloc( 274 281 pmChip *chip, 275 const char *name 276 ) 282 const char *name) 277 283 { 278 284 pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell)); … … 301 307 } 302 308 309 bool psMemCheckCell(psPtr ptr) 310 { 311 PS_ASSERT_PTR(ptr, false); 312 return ( psMemGetDeallocator(ptr) == (psFreeFunc) cellFree); 313 } 314 315 303 316 pmChip *pmChipAlloc( 304 317 pmFPA *fpa, … … 334 347 } 335 348 349 bool psMemCheckChip(psPtr ptr) 350 { 351 PS_ASSERT_PTR(ptr, false); 352 return ( psMemGetDeallocator(ptr) == (psFreeFunc) chipFree); 353 } 354 336 355 pmFPA *pmFPAAlloc(const psMetadata *camera) 337 356 { … … 347 366 348 367 tmpFPA->analysis = psMetadataAlloc(); 349 tmpFPA->camera = psMemIncrRefCounter((psPtr) camera);368 tmpFPA->camera = psMemIncrRefCounter((psPtr) camera); 350 369 tmpFPA->chips = psArrayAlloc(0); 351 370 tmpFPA->hdu = NULL; … … 357 376 return tmpFPA; 358 377 } 378 379 bool psMemCheckFPA(psPtr ptr) 380 { 381 PS_ASSERT_PTR(ptr, false); 382 return ( psMemGetDeallocator(ptr) == (psFreeFunc) FPAFree); 383 } 384 359 385 360 386 // Check a cell to ensure that all component readouts have the parent pointer set correctly … … 402 428 psBool pmFPACheckParents(pmFPA *fpa) 403 429 { 404 PS_ASSERT_PTR_NON_NULL(fpa, true);430 PS_ASSERT_PTR_NON_NULL(fpa, false); 405 431 406 432 bool flag = true;
Note:
See TracChangeset
for help on using the changeset viewer.
