From 6ae399645439097cb3db462fb4273d66878740ba Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 21 Jul 2020 09:59:07 +1000 Subject: [PATCH] Flip Skia-uses-Wuffs-v0.3 from opt-in to opt-out Change-Id: I8b2490e814bd5700a8dc025bce281d8787e1a2a4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303856 Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- src/codec/SkWuffsCodec.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/codec/SkWuffsCodec.cpp b/src/codec/SkWuffsCodec.cpp index d7e11eba24..dec27d2667 100644 --- a/src/codec/SkWuffsCodec.cpp +++ b/src/codec/SkWuffsCodec.cpp @@ -21,6 +21,16 @@ #include +// SK_OPT_OUT_OF_WUFFS_V_0_3 is the step 4 "Flip Skia-uses-Wuffs-v0.3 from +// opt-in to opt-out" comment in the top-level BUILD.gn file. +// +// This SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2 machinery should all be deleted by +// mid-to-late 2020, as part of step 5, when we end up using only Wuffs version +// 0.3, not either of v0.3 and v0.2. +#if !defined(SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2) && !defined(SK_OPT_OUT_OF_WUFFS_V_0_3) +#define SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2 +#endif + // Documentation on the Wuffs language and standard library (in general) and // its image decoding API (in particular) is at: //