Changeset 2765
- Timestamp:
- 02/07/13 17:36:07 (12 years ago)
- Location:
- trunk/external-alma/atnf/PKSIO
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/external-alma/atnf/PKSIO/NRODataRecord.h
r1757 r2765 38 38 #include <vector> 39 39 40 using namespace std ; 40 #include <casa/Utilities/CountedPtr.h> 41 41 42 42 43 // <summary> … … 191 192 // 192 193 // 2009/02/26 Takeshi Nakazato Moved to NROReader 193 c har *LDATA ;194 casa::CountedPtr<char> LDATA ; 194 195 // Spectral data for FITS data 195 196 //vector<int> JDATA ; -
trunk/external-alma/atnf/PKSIO/NRODataset.cc
r2748 r2765 229 229 { 230 230 if ( record_ ) { 231 if ( record_->LDATA != NULL ) {232 delete record_->LDATA ;233 record_->LDATA = NULL ;234 }235 delete record_ ;236 231 record_ = NULL ; 237 232 } … … 296 291 return -1 ; 297 292 } 298 if ( (int)fread( record_->LDATA, 1, dataLen_, fp_ ) != dataLen_ ) {293 if ( (int)fread( &(*record_->LDATA), 1, dataLen_, fp_ ) != dataLen_ ) { 299 294 //cerr << "Failed to read spectral data: " << i << endl ; 300 295 LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ; … … 385 380 return spec ; 386 381 } 387 unsigned char *cdata = (unsigned char *) record->LDATA;382 unsigned char *cdata = (unsigned char *)&(*record->LDATA) ; 388 383 vector<double> mscale = MLTSCF ; 389 384 double dscale = mscale[getIndex( i )] ;
Note:
See TracChangeset
for help on using the changeset viewer.