Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: tests/BadIcoTest.cpp

Issue 1757333002: Fix bug in SkGifCodec / Switch SkImageDec tests to use Codec (Closed) Base URL: https://skia.googlesource.com/skia.git@m50
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/codec/SkGifCodec.cpp ('k') | tests/CachedDecodingPixelRefTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/BadIcoTest.cpp
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp
index 240de514c981f2881d9ee356813fe2d4f760e87d..c387e157be21fdb982eb26cc2b66a09f1b065f03 100644
--- a/tests/BadIcoTest.cpp
+++ b/tests/BadIcoTest.cpp
@@ -8,7 +8,8 @@
#include "Resources.h"
#include "Test.h"
#include "SkBitmap.h"
-#include "SkImageDecoder.h"
+#include "SkCodec.h"
+#include "SkStream.h"
#include "SkOSFile.h"
DEF_TEST(BadImage, reporter) {
@@ -27,12 +28,18 @@ DEF_TEST(BadImage, reporter) {
SkString resourcePath = GetResourcePath(badImagesFolder);
- SkBitmap bm;
for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) {
SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]);
- bool success = SkImageDecoder::DecodeFile(fullPath.c_str(), &bm);
- // These files are invalid, and should not decode. More importantly,
- // though, we reached here without crashing.
- REPORTER_ASSERT(reporter, !success);
+ SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fullPath.c_str()));
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
+
+ // These images are corrupt. It's not important whether we succeed/fail in codec
+ // creation or decoding. We just want to make sure that we don't crash.
+ if (codec) {
+ SkBitmap bm;
+ bm.allocPixels(codec->getInfo());
+ codec->getPixels(codec->getInfo(), bm.getPixels(),
+ bm.rowBytes());
+ }
}
}
« no previous file with comments | « src/codec/SkGifCodec.cpp ('k') | tests/CachedDecodingPixelRefTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698