Changeset 2481 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Dec 9, 2003, 9:29:45 AM (22 years ago)

Author:

ansari

Message:

Corrections bugs ds PPFStream::Write/ReadPositionTag() - Reza 9 Dec 2003

Location:

trunk/SophyaLib/BaseTools

Files:

• ppfbinstream.cc (modified) (7 diffs)
• ppfnametag.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/ppfbinstream.cc

@@ -202 +202 @@
   int_8 pos;
   GetRawI8(pos);
-  GetTypeTag(ppstype);
+  GetRawUByte(ppstype);
   if (ppstype != PPS_EOF)
     throw FileFormatExc("PPFBinaryInputStream::ReadNameTagTable()  Corrupted file, no EOF tag at end of file");
@@ -208 +208 @@
   // On se positionne au debut du NameTagTable
   s->seekg(pos);
-  GetTypeTag(ppstype);
+  GetRawUByte(ppstype);
   if (ppstype != PPS_NAMETAG_TABLE)
     throw FileFormatExc("PPFBinaryInputStream::ReadNameTagTable()  Corrupted file PPS_NAMETAG_TABLE not found");
@@ -242 +242 @@
   s->seekg(-(sizeof(int_8)+1), ios::end);
 
-  GetTypeTag(ppstype);
+  GetRawUByte(ppstype);
   if (ppstype != PPS_EOF)
     throw FileFormatExc("PPFBinaryInputStream::ReadNameTagTableV2() Corrupted file, no eof entry at end of file");
@@ -256 +256 @@
   s->seekg(pos);
   while (true) {
-    GetTypeTag(ppstype);
+    GetRawUByte(ppstype);
     if (ppstype == PPS_EOF) break;
     
@@ -280 +280 @@
 {
   s->seekg(pos);
+  unsigned char ppstag;
+  GetRawUByte(ppstag);
+  if (ppstag != PPS_POSTAG_MARK)
+    throw FileFormatExc("PPFBinaryInputStream::GotoPositionTag() - PPS_POSTAG_MARK not found!");    
   int_8 tpos;
   GetRawI8(tpos);
@@ -411 +415 @@
       GetRawU8(ui8);
       datasz = dsize;
-      asz = i8;      
+      asz = ui8;      
       break;
     }
@@ -1297 +1301 @@
   tagpos = s->tellp();
   PutRawByte(PPS_POSTAG_MARK);
-  PutI8(tagpos);
+  PutRawI8(tagpos);
   _nbpostag++;  // Compteur de nombre de tags 
   return(tagpos);

trunk/SophyaLib/BaseTools/ppfnametag.h

@@ -14 +14 @@
 class PPFNameTag {
 public:
+  PPFNameTag(PPFNameTag const & ptn) { _tname = ptn._tname; }
   PPFNameTag(string const & tn) { _tname = tn; }
   PPFNameTag(const char * tn) { _tname = tn; }
   ~PPFNameTag() { } 
-  inline bool GotoNameTag(PInPersist& pi) 
+  inline bool GotoNameTag(PInPersist& pi) const
   { return pi.GotoNameTag(_tname); }
-  inline void WriteTag(POutPersist& po) 
+  inline void WriteTag(POutPersist& po) const
   { return po.WriteNameTag(_tname); }
   inline char*  operator= (char* s) { _tname = s; return s; }
@@ -28 +29 @@
 };
 
-inline PInPersist& operator >> (PInPersist& si, PPFNameTag & pnt) 
+inline PInPersist& operator >> (PInPersist& si, PPFNameTag const & pnt) 
 { pnt.GotoNameTag(si); return(si); }
 
-inline POutPersist& operator >> (POutPersist& so, PPFNameTag & pnt) 
+inline POutPersist& operator << (POutPersist& so, PPFNameTag const & pnt) 
 { pnt.WriteTag(so); return(so); }