aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkFlate.cpp
diff options
context:
space:
mode:
authorGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-05 20:11:32 +0000
committerGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-05 20:11:32 +0000
commitc7a38f38c938a9828af0a53040e3f27079c67da5 (patch)
tree18d6f91827faaf0c54bf995be0d1e42a649937b7 /src/core/SkFlate.cpp
parentf81401763e2faed6f3af0552ae904edda1864684 (diff)
Make SkFlate buffers statically sized (fixes Windows compile).
Review URL: http://codereview.appspot.com/4357054 git-svn-id: http://skia.googlecode.com/svn/trunk@1059 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkFlate.cpp')
-rw-r--r--src/core/SkFlate.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 985961360e..99b331eb28 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -24,9 +24,6 @@ bool SkFlate::Inflate(SkStream*, SkDynamicMemoryWStream*) { return false; }
#else
// static
-const size_t SkFlate::kBufferSize = 1024;
-
-// static
bool SkFlate::HaveFlate() {
#ifdef SK_DEBUG
return false;
@@ -39,8 +36,10 @@ namespace {
#include SK_ZLIB_INCLUDE
-bool doFlate(bool compress, const size_t kBufferSize, SkStream* src,
- SkDynamicMemoryWStream* dst) {
+// static
+const size_t kBufferSize = 1024;
+
+bool doFlate(bool compress, SkStream* src, SkDynamicMemoryWStream* dst) {
uint8_t inputBuffer[kBufferSize];
uint8_t outputBuffer[kBufferSize];
z_stream flateData;
@@ -121,12 +120,12 @@ bool doFlate(bool compress, const size_t kBufferSize, SkStream* src,
// static
bool SkFlate::Deflate(SkStream* src, SkDynamicMemoryWStream* dst) {
- return doFlate(true, kBufferSize, src, dst);
+ return doFlate(true, src, dst);
}
// static
bool SkFlate::Inflate(SkStream* src, SkDynamicMemoryWStream* dst) {
- return doFlate(false, kBufferSize, src, dst);
+ return doFlate(false, src, dst);
}
#endif