diff options
| author |  Derek Sollenberger <djsollen@google.com> | 2017-03-22 16:19:49 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 16:19:59 +0000 |
| commit | d68c41df1b55abe9c659cd4d236cf5ba5f435a65 (patch) | |
| tree | da93d7c569212624b51eefd4a8e58b75662c1aab /src/codec/SkJpegUtility.h | |
| parent | d3b65972aad96453ff4510caa3e25a2b847c6d1e (diff) | |
Revert "Add support for writing icc profiles to the jpeg encoder"
This reverts commit e3b95ce468c73af8247ba9582a7b84548b19f06a.
Reason for revert: This is breaking the Android auto roller.
Original change's description:
> Add support for writing icc profiles to the jpeg encoder
>
> Also, share the impl for skjpeg_error_mgr between the
> jpeg decoder and encoder. They are already identical
> anyway.
>
> BUG=skia:
>
> Change-Id: I029312406dee8734744cc3058acd1f153aefcd83
> Reviewed-on: https://skia-review.googlesource.com/9971
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,scroggo@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I05fb02610dbf4d9475f158d876d6495b0f7e9db4
Reviewed-on: https://skia-review.googlesource.com/10009
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'src/codec/SkJpegUtility.h')
| -rw-r--r-- | src/codec/SkJpegUtility.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/codec/SkJpegUtility.h b/src/codec/SkJpegUtility.h index dea0753537..43391017b5 100644 --- a/src/codec/SkJpegUtility.h +++ b/src/codec/SkJpegUtility.h @@ -20,12 +20,6 @@ extern "C" { #include "jerror.h" } -static constexpr uint32_t kICCMarker = JPEG_APP0 + 2; -static constexpr uint32_t kICCMarkerHeaderSize = 14; -static constexpr uint8_t kICCSig[] = { - 'I', 'C', 'C', '_', 'P', 'R', 'O', 'F', 'I', 'L', 'E', '\0', -}; - /* * Error handling struct */ |