From 021e5c70160c9682e8d8ab6e2c36a3cb3f57604a Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 18 Oct 2017 18:09:37 +0000 Subject: Revert "Add an Option for orientation on JPEG encodes" This reverts commit 5411a60e0d7370a5d47b5049de845a06fe52e98b. Reason for revert: ASAN and Coverage failing: https://chromium-swarm.appspot.com/task?id=394978f3b7d44610 Flutter_Android failing. Original change's description: > Add an Option for orientation on JPEG encodes > > Move Origin to its own header so that SkPixmap and SkJpegEncoder need > not depend on SkCodec. > > Add libexif, which is already used by Android, and use it to write the > orientation. Write a makefile based on the Android.bp in Android, minus > warnings. (libexif has an LGPL license.) > > Add a test that verifies all the orientations work. > > Optionally enable writing the orientation (and therefore including > libexif). Chromium does not currently need it, and Android does not > expose an API that would allow using it. Disable on Windows, where we > still have build errors to fix. > > Bug: skia:7138 > Change-Id: Iaeff44c36aebe0e639666979dc00e1b7594bbeb1 > Reviewed-on: https://skia-review.googlesource.com/60721 > Commit-Queue: Leon Scroggins > Reviewed-by: Mike Klein > Reviewed-by: Mike Reed TBR=mtklein@chromium.org,mtklein@google.com,scroggo@google.com,reed@google.com Change-Id: I05b7ae8d1c5bbd1de1642d9ef024943500256273 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7138 Reviewed-on: https://skia-review.googlesource.com/61620 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- tests/ExifTest.cpp | 49 +++---------------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) (limited to 'tests/ExifTest.cpp') diff --git a/tests/ExifTest.cpp b/tests/ExifTest.cpp index f2eec7a98e..181f0f9f04 100644 --- a/tests/ExifTest.cpp +++ b/tests/ExifTest.cpp @@ -6,12 +6,7 @@ */ #include "Resources.h" -#include "SkBitmap.h" #include "SkCodec.h" -#include "SkColor.h" -#include "SkImageInfo.h" -#include "SkJpegEncoder.h" -#include "SkStream.h" #include "Test.h" DEF_TEST(ExifOrientation, r) { @@ -23,49 +18,11 @@ DEF_TEST(ExifOrientation, r) { std::unique_ptr codec(SkCodec::MakeFromStream(std::move(stream))); REPORTER_ASSERT(r, nullptr != codec); - SkEncodedOrigin origin = codec->getOrigin(); - REPORTER_ASSERT(r, kTopRight_SkEncodedOrigin == origin); + SkCodec::Origin origin = codec->getOrigin(); + REPORTER_ASSERT(r, SkCodec::kTopRight_Origin == origin); codec = SkCodec::MakeFromStream(GetResourceAsStream("mandrill_512_q075.jpg")); REPORTER_ASSERT(r, nullptr != codec); origin = codec->getOrigin(); - REPORTER_ASSERT(r, kTopLeft_SkEncodedOrigin == origin); + REPORTER_ASSERT(r, SkCodec::kTopLeft_Origin == origin); } - -#ifdef SK_HAS_EXIF_LIBRARY -DEF_TEST(ExifWriteOrientation, r) { - SkBitmap bm; - bm.allocPixels(SkImageInfo::MakeN32Premul(100, 100)); - bm.eraseColor(SK_ColorBLUE); - SkPixmap pm; - if (!bm.peekPixels(&pm)) { - ERRORF(r, "failed to peek pixels"); - return; - } - for (auto o : { kTopLeft_SkEncodedOrigin, - kTopRight_SkEncodedOrigin, - kBottomRight_SkEncodedOrigin, - kBottomLeft_SkEncodedOrigin, - kLeftTop_SkEncodedOrigin, - kRightTop_SkEncodedOrigin, - kRightBottom_SkEncodedOrigin, - kLeftBottom_SkEncodedOrigin }) { - SkDynamicMemoryWStream stream; - SkJpegEncoder::Options options; - options.fOrigin = o; - if (!SkJpegEncoder::Encode(&stream, pm, options)) { - ERRORF(r, "Failed to encode with orientation %i", o); - return; - } - - auto data = stream.detachAsData(); - auto codec = SkCodec::MakeFromData(std::move(data)); - if (!codec) { - ERRORF(r, "Failed to create a codec with orientation %i", o); - return; - } - - REPORTER_ASSERT(r, codec->getOrigin() == o); - } -} -#endif -- cgit v1.2.3