From 96287f7af7ff6aaa48b8d28ec6b7b79836da2d7c Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 7 May 2015 11:46:59 -0700 Subject: SkPDF: detect YUV-JPEG without relying on ImageGenerator JPEG/JFIF References: * http://www.w3.org/Graphics/JPEG/itu-t81.pdf * http://www.w3.org/Graphics/JPEG/jfif3.pdf BUG=476721 BUG=446940 Review URL: https://codereview.chromium.org/1133443003 --- tests/PDFJpegEmbedTest.cpp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'tests/PDFJpegEmbedTest.cpp') diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp index 133d84a3ff..cfe6776bf5 100644 --- a/tests/PDFJpegEmbedTest.cpp +++ b/tests/PDFJpegEmbedTest.cpp @@ -87,3 +87,41 @@ DEF_TEST(PDFJpegEmbedTest, r) { // embedded into the PDF directly. REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData)); } + +#include "SkJpegInfo.h" + +DEF_TEST(JpegIdentification, r) { + static struct { + const char* path; + bool isJfif; + SkJFIFInfo::Type type; + } kTests[] = {{"CMYK.jpg", false, SkJFIFInfo::kGrayscale}, + {"color_wheel.jpg", true, SkJFIFInfo::kYCbCr}, + {"grayscale.jpg", true, SkJFIFInfo::kGrayscale}, + {"mandrill_512_q075.jpg", true, SkJFIFInfo::kYCbCr}, + {"randPixels.jpg", true, SkJFIFInfo::kYCbCr}}; + for (size_t i = 0; i < SK_ARRAY_COUNT(kTests); ++i) { + SkAutoTUnref data( + load_resource(r, "JpegIdentification", kTests[i].path)); + if (!data) { + continue; + } + SkJFIFInfo info; + bool isJfif = SkIsJFIF(data, &info); + if (isJfif != kTests[i].isJfif) { + ERRORF(r, "%s failed isJfif test", kTests[i].path); + continue; + } + if (!isJfif) { + continue; // not applicable + } + if (kTests[i].type != info.fType) { + ERRORF(r, "%s failed jfif type test", kTests[i].path); + continue; + } + if (r->verbose()) { + SkDebugf("\nJpegIdentification: %s [%d x %d]\n", kTests[i].path, + info.fWidth, info.fHeight); + } + } +} -- cgit v1.2.3