Changeset 2476 in Sophya for trunk/SophyaLib/BaseTools/ppfbinstream.h

Timestamp:

Dec 5, 2003, 12:02:27 AM (22 years ago)

Author:

ansari

Message:

Debug/correction des ppersist suite a la separation des PInOutPersist en PPFInOutStream - Reza 5 Dec 2003

File:

• trunk/SophyaLib/BaseTools/ppfbinstream.h (modified) (8 diffs)

trunk/SophyaLib/BaseTools/ppfbinstream.h

@@ -55 +55 @@
   };
   
-  PPFBinaryIOStream();
-  virtual ~PPFBinaryIOStream();
+  PPFBinaryIOStream() { }
+  virtual ~PPFBinaryIOStream() { }
   int    Version() {return version;}  // PIn/OutPersist version number
-  string FileName() { return filename; }   // Retourne le nom de fichier
   
 protected:
   
   map<string, int_8> tags;
-  string filename;
   int version;     // PPersist(In/Out) version 
 };
@@ -71 +69 @@
 class PPFBinaryInputStream : public PPFBinaryIOStream {
 public:
-  PPFBinaryInputStream();
+  PPFBinaryInputStream(RawInOutStream * is, bool ad, bool scan=false);
   PPFBinaryInputStream(string const& flnm, bool scan=true);
   virtual  ~PPFBinaryInputStream();
+
+  inline string FileName() { return s->getFileName(); }   // Retourne le nom de fichier
   
   // Gestion des tags
@@ -85 +85 @@
   // Saut jusqu'au prochain objet 
   bool   SkipToNextObject();
-  // Saut d'un item de base (tag+donnees correspondantes)
-  bool   SkipItem();
+  // Saut d'un item de base (tag+donnees correspondantes), le suivant ds le flot
+  bool   SkipNextItem();
+  // Lecture du tag de type next item + infos correspondantes
+  // Le stream est re-positionne avant le tag 
+  char   NextItemTag(short datasz, size_t sz);
   
   // Lecture donnees de base et tableaux de donnees de base
@@ -157 +160 @@
   
 protected:
+  void   Init(bool scan);
+  void   ReadNameTagTableV2();
+  void   ReadNameTagTable();
+
+  void   SkipItem(bool fgrdi, char itag);
+
   void   CheckTag   (short datasz, short datatype);
   void   CheckArrayTag(short datasz, size_t sz, short datatype);
@@ -168 +177 @@
   void   GetRawU8   (uint_8&);
   
-  void   Scan();
-  
   RawInOutStream* s;
+  bool _ads; // delete/close the stream at the end
   
   bool bigEndian;
@@ -181 +189 @@
 class PPFBinaryOutputStream : public PPFBinaryIOStream {
 public:
-  PPFBinaryOutputStream();
+  PPFBinaryOutputStream(RawInOutStream* os, bool ad, int endianness = PPS_NATIVE);
   PPFBinaryOutputStream(string const& flnm, int endianness = PPS_NATIVE);
   virtual ~PPFBinaryOutputStream();
+
+  inline string FileName() { return s->getFileName(); }   // Retourne le nom de fichier
   
   // Ecriture de tags
@@ -253 +263 @@
   
 protected:
-  RawInOutStream* s;
-  bool bigEndian;
-  
+  void     Init(int endianness);
+  void     WriteNameTagTable();
+  void     WriteNameTagTableV2();
+
   void     PutArrayTag(short datasz, size_t sz, short datatype);
   void     PutRawByte (char);
@@ -264 +275 @@
   void     PutRawU8   (uint_8);
   void     PutRawBytes(void const* ptr, size_t bytes);
-  
+
+  // Attributs, variables
+  RawInOutStream* s;
+  bool _ads; // delete/close the stream at the end
+
+  bool bigEndian;
+
 };