diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 20:45:40 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 20:45:40 +0000 |
| commit | 7453d0e450917209871c7ea54132bb5c18c7e2d3 (patch) | |
| tree | 794c625a86931227be67a92bb3c13bb035012cf1 | |
| parent | 67d0cff9acb2f2a9fe19c5282ca06ac3332a043c (diff) | |
use general SkWStream for parameter
git-svn-id: http://skia.googlecode.com/svn/trunk@1719 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/core/SkFlate.h | 6 | ||||
| -rw-r--r-- | src/core/SkFlate.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/core/SkFlate.h b/include/core/SkFlate.h index b606742150..ef76f68450 100644 --- a/include/core/SkFlate.h +++ b/include/core/SkFlate.h @@ -19,7 +19,7 @@ #include "SkTypes.h" -class SkDynamicMemoryWStream; +class SkWStream; class SkStream; /** \class SkFlate @@ -34,12 +34,12 @@ public: /** Use the flate compression algorithm to compress the data in src, putting the result into dst. Returns false if an error occurs. */ - static bool Deflate(SkStream* src, SkDynamicMemoryWStream* dst); + static bool Deflate(SkStream* src, SkWStream* dst); /** Use the flate compression algorithm to decompress the data in src, putting the result into dst. Returns false if an error occurs. */ - static bool Inflate(SkStream* src, SkDynamicMemoryWStream* dst); + static bool Inflate(SkStream* src, SkWStream* dst); }; #endif diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp index 99b331eb28..5acf2abfa0 100644 --- a/src/core/SkFlate.cpp +++ b/src/core/SkFlate.cpp @@ -19,8 +19,8 @@ #ifndef SK_ZLIB_INCLUDE bool SkFlate::HaveFlate() { return false; } -bool SkFlate::Deflate(SkStream*, SkDynamicMemoryWStream*) { return false; } -bool SkFlate::Inflate(SkStream*, SkDynamicMemoryWStream*) { return false; } +bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; } +bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; } #else // static @@ -39,7 +39,7 @@ namespace { // static const size_t kBufferSize = 1024; -bool doFlate(bool compress, SkStream* src, SkDynamicMemoryWStream* dst) { +bool doFlate(bool compress, SkStream* src, SkWStream* dst) { uint8_t inputBuffer[kBufferSize]; uint8_t outputBuffer[kBufferSize]; z_stream flateData; @@ -119,12 +119,12 @@ bool doFlate(bool compress, SkStream* src, SkDynamicMemoryWStream* dst) { } // static -bool SkFlate::Deflate(SkStream* src, SkDynamicMemoryWStream* dst) { +bool SkFlate::Deflate(SkStream* src, SkWStream* dst) { return doFlate(true, src, dst); } // static -bool SkFlate::Inflate(SkStream* src, SkDynamicMemoryWStream* dst) { +bool SkFlate::Inflate(SkStream* src, SkWStream* dst) { return doFlate(false, src, dst); } |