diff options
| author |  halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-05 14:18:07 +0000 |
|---|---|---|
| committer | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-05 14:18:07 +0000 |
| commit | dcfebfa823fe09886f996b66f223c1deb37c16d1 (patch) | |
| tree | e543148028c80a70a939e87e29841efd6928ba3d | |
| parent | 36d08c5c90c7607cd559769f7a9c2b3364eeba85 (diff) | |
Fix MacOS build error from 36d08c5c90c7
BUG=
Review URL: https://codereview.chromium.org/105453005
git-svn-id: http://skia.googlecode.com/svn/trunk@12506 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | tests/CachedDecodingPixelRefTest.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index af1df1093c..0706ab1d85 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -9,7 +9,6 @@ #include "SkCanvas.h" #include "SkData.h" #include "SkDecodingImageGenerator.h" -#include "SkForceLinking.h" #include "SkImageDecoder.h" #include "SkImagePriv.h" #include "SkLazyPixelRef.h" @@ -20,8 +19,6 @@ #include "Test.h" #include "TestClassDef.h" -__SK_FORCE_IMAGE_DECODER_LINKING; - /** * Fill this bitmap with some color. */ @@ -168,7 +165,7 @@ static void test_three_encodings(skiatest::Reporter* reporter, /** * This checks to see that a SkLazyPixelRef works as advertised. */ -bool install_skLazyPixelRef(SkData* encoded, SkBitmap* dst) { +static bool install_skLazyPixelRef(SkData* encoded, SkBitmap* dst) { static const SkBitmapFactory::DecodeProc decoder = &(SkImageDecoder::DecodeMemoryToTarget); return simple_bitmap_factory(decoder, encoded, dst); @@ -181,7 +178,7 @@ DEF_TEST(LazyPixelRef, reporter) { /** * This checks to see that a SkCachingPixelRef works as advertised. */ -bool install_skCachingPixelRef(SkData* encoded, SkBitmap* dst) { +static bool install_skCachingPixelRef(SkData* encoded, SkBitmap* dst) { return SkCachingPixelRef::Install( SkNEW_ARGS(SkDecodingImageGenerator, (encoded)), dst); } |