Changeset 11424

Timestamp:

07/15/11 15:43:08 (13 years ago)

Author:

tbretz

Message:

Fixed seeking in gzipped files; increased buffer size

Location:

trunk/Mars/mbase

Files:

• MZlib.cc (modified) (1 diff)
• MZlib.h (modified) (1 diff)

trunk/Mars/mbase/MZlib.cc

@@ -138 +138 @@
     if (dir==ios::cur)
     {
-        // Position in z-stream
-        const z_off_t zpos = gztell(fFile); //gzseek(fFile, 0, SEEK_CUR);
-
         // Calculate future position in streambuffer
         const char *ptr = gptr()+offset;
+
+        // Position in z-stream
+        const z_off_t zpos = gztell(fFile)+gptr()-egptr(); //gzseek(fFile, 0, SEEK_CUR);
 
         // Check if the new position will still be in the buffer

trunk/Mars/mbase/MZlib.h

@@ -18 +18 @@
 {
 private:
-    static const int fgBufferSize = 47+256; // size of data buff totals 512 bytes under g++ for igzstream at the end.
+    static const int fgBufferSize = 3276804; // maximum size of a fact event + 4
 
     gzFile fFile;                 // file handle for compressed file