aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-15 22:05:03 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-15 22:05:03 +0000
commitaaec851ad16d312390398f245ca66aaa6d304ebb (patch)
tree917c0c773762c34536085cfedb4de108aeeb04c8
parent6b96d368f0dbd09bdec2e209a08fa6306c4a3603 (diff)
Link webp in skimage and debugger.
Review URL: https://codereview.chromium.org/14103020 git-svn-id: http://skia.googlecode.com/svn/trunk@8691 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--debugger/SkDebugger.cpp2
-rw-r--r--tools/skimage_main.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp
index 875dfd6cc6..3a13579894 100644
--- a/debugger/SkDebugger.cpp
+++ b/debugger/SkDebugger.cpp
@@ -138,6 +138,8 @@ void forceLinking() {
// decoders.
SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder();
SkASSERT(creator);
+ SkDEBUGCODE(creator = ) CreateWEBPImageDecoder();
+ SkASSERT(creator);
#if defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL)
SkDEBUGCODE(creator = ) CreateGIFImageDecoder();
SkASSERT(creator);
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index b486d5d1a3..af9b4adea2 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -164,6 +164,8 @@ void forceLinking() {
// decoders.
SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder();
SkASSERT(creator);
+ SkDEBUGCODE(creator = ) CreateWEBPImageDecoder();
+ SkASSERT(creator);
#ifdef SK_BUILD_FOR_UNIX
SkDEBUGCODE(creator = ) CreateGIFImageDecoder();
SkASSERT(creator);