From 5dbd27484641279b53369587c93ba0566c20a161 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 2 Aug 2016 11:13:48 -0700 Subject: gn: fix fiddle - __SK_FORCE_IMAGE_DECODER_LINKING makes sure the PNG encoder is linked - updated path to make working with sample draw.cpp easier. No public API changes. TBR=reed@google.com BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2202353002 Review-Url: https://codereview.chromium.org/2202353002 --- tools/fiddle/draw.cpp | 2 +- tools/fiddle/fiddle_main.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/fiddle') diff --git a/tools/fiddle/draw.cpp b/tools/fiddle/draw.cpp index 78f428da2a..68cbbdf8d6 100644 --- a/tools/fiddle/draw.cpp +++ b/tools/fiddle/draw.cpp @@ -12,7 +12,7 @@ #include "fiddle_main.h" DrawOptions GetDrawOptions() { // path *should* be absolute. - static const char path[] = "../../resources/color_wheel.png"; + static const char path[] = "resources/color_wheel.png"; return DrawOptions(256, 256, true, true, true, true, path); } void draw(SkCanvas* canvas) { diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp index 1c80c4416c..df2e8ff66e 100644 --- a/tools/fiddle/fiddle_main.cpp +++ b/tools/fiddle/fiddle_main.cpp @@ -7,6 +7,9 @@ #include #include +#include "SkForceLinking.h" + +__SK_FORCE_IMAGE_DECODER_LINKING; #include "fiddle_main.h" -- cgit v1.2.3