Index: tests/ImageDecodingTest.cpp |
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp |
index 7f9ff3042e8657146078006dac05309481f32fd6..21c774727d86d6286f3d2881b26ce0594644af9a 100644 |
--- a/tests/ImageDecodingTest.cpp |
+++ b/tests/ImageDecodingTest.cpp |
@@ -16,7 +16,7 @@ |
#include "SkGradientShader.h" |
#include "SkImageDecoder.h" |
#include "SkImageEncoder.h" |
-#include "SkImageGenerator.h" |
+#include "SkImageGeneratorPriv.h" |
hal.canary
2014/05/27 13:33:53
do we still need this?
|
#include "SkImagePriv.h" |
#include "SkOSFile.h" |
#include "SkPoint.h" |
@@ -455,7 +455,7 @@ DEF_TEST(WebP, reporter) { |
bool success = SkInstallDiscardablePixelRef( |
SkDecodingImageGenerator::Create(encoded, |
- SkDecodingImageGenerator::Options()), &bm, NULL); |
+ SkDecodingImageGenerator::Options()), &bm); |
REPORTER_ASSERT(reporter, success); |
if (!success) { |
@@ -584,14 +584,13 @@ static void test_options(skiatest::Reporter* reporter, |
return; |
} |
success = SkInstallDiscardablePixelRef( |
- SkDecodingImageGenerator::Create(encodedData, opts), &bm, NULL); |
+ SkDecodingImageGenerator::Create(encodedData, opts), &bm); |
} else { |
if (NULL == encodedStream) { |
return; |
} |
success = SkInstallDiscardablePixelRef( |
- SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), |
- &bm, NULL); |
+ SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), &bm); |
} |
if (!success) { |
if (opts.fUseRequestedColorType |