Changeset 6694 for branches/1.7

Timestamp:

Mar 26, 2018, 1:43:34 PM (7 years ago)

Author:

clarksm

Message:

Set gzip header OS byte to unknown. Matches the tkImg version
used in Rappture GUI and wrapper scripts.

File:

• branches/1.7/src/core/RpBuffer.cc (modified) (2 diffs)

branches/1.7/src/core/RpBuffer.cc

@@ -270 +270 @@
     int ret=0, flush=0;
     z_stream strm;
+    gz_header gzheader;
 
     char in[CHUNK];
@@ -287 +288 @@
     if (ret != Z_OK) {
         status.addError("error while initializing zlib stream object");
+        return false;
+    }
+
+    gzheader.text = 0;
+    gzheader.hcrc = 0;
+    gzheader.extra = Z_NULL;
+    gzheader.name = Z_NULL;
+    gzheader.comment = Z_NULL;
+    gzheader.time = 0;
+    gzheader.os = 0xff;  /* Force originating source OS to be unknown.
+                            This matches what is done with the tkImg version
+                            of zlib.  */
+
+    ret = deflateSetHeader( &strm, &gzheader);
+
+    if (ret != Z_OK) {
+        status.addError("error while initializing zlib gzip header object");
         return false;
     }