Index: third_party/protobuf/src/google/protobuf/io/gzip_stream.h |
=================================================================== |
--- third_party/protobuf/src/google/protobuf/io/gzip_stream.h (revision 216642) |
+++ third_party/protobuf/src/google/protobuf/io/gzip_stream.h (working copy) |
@@ -45,6 +45,7 @@ |
#include <zlib.h> |
+#include <google/protobuf/stubs/common.h> |
#include <google/protobuf/io/zero_copy_stream.h> |
namespace google { |
@@ -144,12 +145,6 @@ |
ZeroCopyOutputStream* sub_stream, |
const Options& options); |
- // DEPRECATED: Use one of the above constructors instead. |
- GzipOutputStream( |
- ZeroCopyOutputStream* sub_stream, |
- Format format, |
- int buffer_size = -1) GOOGLE_ATTRIBUTE_DEPRECATED; |
- |
virtual ~GzipOutputStream(); |
// Return last error message or NULL if no error. |
@@ -165,6 +160,13 @@ |
// necessary. |
// Compression may be less efficient stopping and starting around flushes. |
// Returns true if no error. |
+ // |
+ // Please ensure that block size is > 6. Here is an excerpt from the zlib |
+ // doc that explains why: |
+ // |
+ // In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that avail_out |
+ // is greater than six to avoid repeated flush markers due to |
+ // avail_out == 0 on return. |
bool Flush(); |
// Writes out all data and closes the gzip stream. |