| Index: tests/CachedDecodingPixelRefTest.cpp
|
| diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
|
| index af1df1093c3469dc082195a1cd60a5a1ffd54a3f..0706ab1d85b227de379d0a6ed779a3f1b8b00657 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);
|
| }
|
|
|