aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/PDFJpegEmbedTest.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-04-17 13:27:24 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-17 13:27:24 -0700
commita8448bc3dfe0f2e768838b4416fb3ebf823b694e (patch)
treeabf34ab1bc7bfee5aac81f4a6d1f4c4b636b66fd /tests/PDFJpegEmbedTest.cpp
parent673e902c9b9982a167f54f1cc175d8d9cab8bcaf (diff)
PDF: Correctly embed JPEG images directly into PDF output.
We only embed images with YUV planes. That should only grab the subset of color JPEGs supported by PDF. BUG=skia:3180 Review URL: https://codereview.chromium.org/1025773002
Diffstat (limited to 'tests/PDFJpegEmbedTest.cpp')
-rw-r--r--tests/PDFJpegEmbedTest.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index beb949dfc9..133d84a3ff 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -81,19 +81,9 @@ DEF_TEST(PDFJpegEmbedTest, r) {
SkASSERT(pdfData);
pdf.reset();
- // Test disabled, waiting on resolution to http://skbug.com/3180
- // REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+ REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
// This JPEG uses a nonstandard colorspace - it can not be
// embedded into the PDF directly.
REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
-
- // The following is for debugging purposes only.
- const char* outputPath = getenv("SKIA_TESTS_PDF_JPEG_EMBED_OUTPUT_PATH");
- if (outputPath) {
- SkFILEWStream output(outputPath);
- if (output.isValid()) {
- output.write(pdfData->data(), pdfData->size());
- }
- }
}