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 --- include/encode/SkJpegEncoder.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'include/encode') diff --git a/include/encode/SkJpegEncoder.h b/include/encode/SkJpegEncoder.h index a094e3fb9c..fd7c204161 100644 --- a/include/encode/SkJpegEncoder.h +++ b/include/encode/SkJpegEncoder.h @@ -9,9 +9,6 @@ #define SkJpegEncoder_DEFINED #include "SkEncoder.h" -#ifdef SK_HAS_EXIF_LIBRARY -#include "SkEncodedOrigin.h" -#endif class SkJpegEncoderMgr; class SkWStream; @@ -65,13 +62,6 @@ public: */ AlphaOption fAlphaOption = AlphaOption::kIgnore; SkTransferFunctionBehavior fBlendBehavior = SkTransferFunctionBehavior::kRespect; - -#ifdef SK_HAS_EXIF_LIBRARY - /** - * Origin to be written to EXIF, if anything other than the default. - */ - SkEncodedOrigin fOrigin = kDefault_SkEncodedOrigin; -#endif }; /** -- cgit v1.2.3