Changeset 2885 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Jan 4, 2006, 2:36:47 PM (20 years ago)

Author:

ansari

Message:

Modifs (ajout this->) pour compilation avec g++ 4 (V >= 3.4) - Reza 4 Jan 2006

Location:

trunk/SophyaLib/NTools

Files:

• cimage.cc (modified) (4 diffs)
• cimage.h (modified) (2 diffs)

trunk/SophyaLib/NTools/cimage.cc

@@ -101 +101 @@
   : FIO_TArray<T>()
 { 
-  dobj = new Image<T>(obj, true);
-  ownobj=true; 
+  this->dobj = new Image<T>(obj, true);
+  this->ownobj=true; 
 }
 
@@ -124 +124 @@
     throw TypeMismatchExc(PExcLongMessage(buff));        
   }
-  if (ownobj && dobj) delete dobj;
-  dobj = po; ownobj = false;
+  if (this->ownobj && this->dobj) delete this->dobj;
+  this->dobj = po; this->ownobj = false;
 } 
 
@@ -131 +131 @@
 void FIO_Image<T>::ReadSelf(PInPersist& is)
 {
-  if (dobj == NULL) dobj = new Image<T>;
-  Image<T> * img = dynamic_cast<Image<T> * > (dobj);
+  if (this->dobj == NULL) this->dobj = new Image<T>;
+  Image<T> * img = dynamic_cast<Image<T> * > (this->dobj);
 // On lit les 3 premiers uint_4
 //  0: Numero de version,  1 : reserve
@@ -155 +155 @@
 void FIO_Image<T>::WriteSelf(POutPersist& os) const
 {
-  if (dobj == NULL)   return;
-  Image<T> * img = dynamic_cast<Image<T> * > (dobj);
+  if (this->dobj == NULL)   return;
+  Image<T> * img = dynamic_cast<Image<T> * > (this->dobj);
 //  On ecrit 3 uint_4 .... 
   uint_4 itab[3];

trunk/SophyaLib/NTools/cimage.h

@@ -33 +33 @@
 
   //! Returns the image size along X (corresponding to the number of columns)  
-  inline sa_size_t  XSize() const {return NCols();}
+  inline sa_size_t  XSize() const {return this->NCols();}
   //! Returns the image size along Y (corresponding to the number of lines)  
-  inline sa_size_t  YSize() const {return NRows();}
+  inline sa_size_t  YSize() const {return this->NRows();}
 
   //! Returns the X position, for pixel(0,0)
@@ -89 +89 @@
   //  virtual ~FIO_Image();  
   virtual void        SetDataObj(AnyDataObj & o);
-  inline operator Image<T>() { return(*(dynamic_cast<Image<T> * >(dobj))); }
+  inline operator Image<T>() { return(*(dynamic_cast<Image<T> * >(this->dobj))); }
 protected :
   virtual void ReadSelf(PInPersist&);