Changeset 2765 for trunk/external-alma/atnf/PKSIO/NRODataset.cc

Timestamp:

02/07/13 17:36:07 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Use CountedPtr? instead of raw C pointer.

File:

• trunk/external-alma/atnf/PKSIO/NRODataset.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NRODataset.cc

@@ -229 +229 @@
 {
   if ( record_ ) {
-    if ( record_->LDATA != NULL ) {
-      delete record_->LDATA ;
-      record_->LDATA = NULL ;
-    }
-    delete record_ ;
     record_ = NULL ;
   }
@@ -296 +291 @@
     return -1 ;
   }
-  if ( (int)fread( record_->LDATA, 1, dataLen_, fp_ ) != dataLen_ ) {
+  if ( (int)fread( &(*record_->LDATA), 1, dataLen_, fp_ ) != dataLen_ ) {
     //cerr << "Failed to read spectral data: " << i << endl ;
     LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ;
@@ -385 +380 @@
     return spec ;
   }
-  unsigned char *cdata = (unsigned char *)record->LDATA ;
+  unsigned char *cdata = (unsigned char *)&(*record->LDATA) ;
   vector<double> mscale = MLTSCF ;
   double dscale = mscale[getIndex( i )] ;