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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: src/core/SkFlate.cpp
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 2b4e36d7271ea99fe11e8ac2b302d5b8fed4f28a..d633e6389fbae46cb82e69fe1fc42ce67bb4d10c 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -11,7 +11,7 @@
#include "SkFlate.h"
#include "SkStream.h"
-#ifndef SK_HAS_ZLIB
+#if !defined(SK_HAS_ZLIB) && !defined(MINIZ_INCLUDE)
bool SkFlate::HaveFlate() { return false; }
bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; }
bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; }
@@ -26,7 +26,9 @@ bool SkFlate::HaveFlate() {
namespace {
-#ifdef SK_SYSTEM_ZLIB
+#ifdef MINIZ_INCLUDE
+#include MINIZ_INCLUDE
+#elif defined(SK_SYSTEM_ZLIB)
#include <zlib.h>
#else
#include SK_ZLIB_INCLUDE
mtklein 2014/08/13 17:57:09 Can we do this so that SK_ZLIB_INCLUDE is defined

Powered by Google App Engine
This is Rietveld 408576698