Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: src/core/SkFlate.cpp

Issue 469813002: Add miniz library to third_party, use it on Windows (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2010 The Android Open Source Project 3 * Copyright 2010 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkData.h" 10 #include "SkData.h"
11 #include "SkFlate.h" 11 #include "SkFlate.h"
12 #include "SkStream.h" 12 #include "SkStream.h"
13 13
14 #ifndef SK_HAS_ZLIB 14 #if !defined(SK_HAS_ZLIB) && !defined(MINIZ_INCLUDE)
15 bool SkFlate::HaveFlate() { return false; } 15 bool SkFlate::HaveFlate() { return false; }
16 bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; } 16 bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; }
17 bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; } 17 bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; }
18 bool SkFlate::Deflate(const SkData*, SkWStream*) { return false; } 18 bool SkFlate::Deflate(const SkData*, SkWStream*) { return false; }
19 bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; } 19 bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; }
20 #else 20 #else
21 21
22 // static 22 // static
23 bool SkFlate::HaveFlate() { 23 bool SkFlate::HaveFlate() {
24 return true; 24 return true;
25 } 25 }
26 26
27 namespace { 27 namespace {
28 28
29 #ifdef SK_SYSTEM_ZLIB 29 #ifdef MINIZ_INCLUDE
30 #include MINIZ_INCLUDE
31 #elif defined(SK_SYSTEM_ZLIB)
30 #include <zlib.h> 32 #include <zlib.h>
31 #else 33 #else
32 #include SK_ZLIB_INCLUDE 34 #include SK_ZLIB_INCLUDE
mtklein 2014/08/13 17:57:09 Can we do this so that SK_ZLIB_INCLUDE is defined
33 #endif 35 #endif
34 36
35 // static 37 // static
36 const size_t kBufferSize = 1024; 38 const size_t kBufferSize = 1024;
37 39
38 bool doFlate(bool compress, SkStream* src, SkWStream* dst) { 40 bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
39 uint8_t inputBuffer[kBufferSize]; 41 uint8_t inputBuffer[kBufferSize];
40 uint8_t outputBuffer[kBufferSize]; 42 uint8_t outputBuffer[kBufferSize];
41 z_stream flateData; 43 z_stream flateData;
42 flateData.zalloc = NULL; 44 flateData.zalloc = NULL;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 } 133 }
132 return false; 134 return false;
133 } 135 }
134 136
135 // static 137 // static
136 bool SkFlate::Inflate(SkStream* src, SkWStream* dst) { 138 bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
137 return doFlate(false, src, dst); 139 return doFlate(false, src, dst);
138 } 140 }
139 141
140 #endif 142 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698