diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-18 11:43:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-18 17:38:15 +0000 |
| commit | 5411a60e0d7370a5d47b5049de845a06fe52e98b (patch) | |
| tree | 8995da6236e7f37419a4d3075c35bbdc36049672 /include/encode | |
| parent | 1d014105ac8e5968b6d260745c807ab45dfee956 (diff) | |
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 <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'include/encode')
| -rw-r--r-- | include/encode/SkJpegEncoder.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/encode/SkJpegEncoder.h b/include/encode/SkJpegEncoder.h index fd7c204161..a094e3fb9c 100644 --- a/include/encode/SkJpegEncoder.h +++ b/include/encode/SkJpegEncoder.h @@ -9,6 +9,9 @@ #define SkJpegEncoder_DEFINED #include "SkEncoder.h" +#ifdef SK_HAS_EXIF_LIBRARY +#include "SkEncodedOrigin.h" +#endif class SkJpegEncoderMgr; class SkWStream; @@ -62,6 +65,13 @@ 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 }; /** |