diff options
author | Derek Sollenberger <djsollen@google.com> | 2017-03-22 18:54:25 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 18:54:30 +0000 |
commit | dda14b9b7ac13dba9214f484fc6270b3ccf4b68b (patch) | |
tree | 04975df7bad9c9c75c9fcf0aa52f2e3dac2a7716 /src/images/SkImageEncoderFns.h | |
parent | 70131b97f97f97d6fbcf4545b97827dfe8509654 (diff) |
Revert "Add support for writing icc profiles to the jpeg encoder"
This reverts commit 4ef01482025e2e629e35458aa214436d3b4138e8.
Reason for revert: This breaks the android autoroller.
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: I4d67f28126388fef3057d62b6e0b203e21ed4afb
> Reviewed-on: https://skia-review.googlesource.com/10011
> 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: Idbb9918370e8384e39d6b7d1c3bcd9545ce4cfd1
Reviewed-on: https://skia-review.googlesource.com/10017
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'src/images/SkImageEncoderFns.h')
-rw-r--r-- | src/images/SkImageEncoderFns.h | 290 |
1 files changed, 0 insertions, 290 deletions
diff --git a/src/images/SkImageEncoderFns.h b/src/images/SkImageEncoderFns.h deleted file mode 100644 index 5120570c48..0000000000 --- a/src/images/SkImageEncoderFns.h +++ /dev/null @@ -1,290 +0,0 @@ -/* - * Copyright 2012 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkImageEncoderFns_DEFINED -#define SkImageEncoderFns_DEFINED - -/** - * Functions to transform scanlines between packed-pixel formats. - */ - -#include "SkBitmap.h" -#include "SkColor.h" -#include "SkColorPriv.h" -#include "SkICC.h" -#include "SkPreConfig.h" -#include "SkRasterPipeline.h" -#include "SkUnPreMultiply.h" -#include "SkUnPreMultiplyPriv.h" - -/** - * Function template for transforming scanlines. - * Transform 'width' pixels from 'src' buffer into 'dst' buffer, - * repacking color channel data as appropriate for the given transformation. - * 'bpp' is bytes per pixel in the 'src' buffer. - */ -typedef void (*transform_scanline_proc)(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int bpp, const SkPMColor* colors); - -/** - * Identity transformation: just copy bytes from src to dst. - */ -static inline void transform_scanline_memcpy(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int bpp, const SkPMColor*) { - memcpy(dst, src, width * bpp); -} - -static inline void transform_scanline_index8_opaque(char* SK_RESTRICT dst, - const char* SK_RESTRICT src, int width, int, - const SkPMColor* colors) { - for (int i = 0; i < width; i++) { - const uint32_t c = colors[(uint8_t)*src++]; - dst[0] = SkGetPackedR32(c); - dst[1] = SkGetPackedG32(c); - dst[2] = SkGetPackedB32(c); - dst += 3; - } -} - -static inline void transform_scanline_index8_unpremul(char* SK_RESTRICT dst, - const char* SK_RESTRICT src, int width, int, - const SkPMColor* colors) { - uint32_t* SK_RESTRICT dst32 = (uint32_t*) dst; - for (int i = 0; i < width; i++) { - // This function swizzles R and B on platforms where SkPMColor is BGRA. This is - // exactly what we want. - dst32[i] = SkSwizzle_RGBA_to_PMColor(colors[(uint8_t)*src++]); - } -} - -static inline void transform_scanline_gray(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor* colors) { - for (int i = 0; i < width; i++) { - const uint8_t g = (uint8_t) *src++; - dst[0] = g; - dst[1] = g; - dst[2] = g; - dst += 3; - } -} - -/** - * Transform from kRGB_565_Config to 3-bytes-per-pixel RGB. - * Alpha channel data is not present in kRGB_565_Config format, so there is no - * alpha channel data to preserve. - */ -static inline void transform_scanline_565(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const uint16_t* srcP = (const uint16_t*)src; - for (int i = 0; i < width; i++) { - unsigned c = *srcP++; - *dst++ = SkPacked16ToR32(c); - *dst++ = SkPacked16ToG32(c); - *dst++ = SkPacked16ToB32(c); - } -} - -/** - * Transform from kRGBA_8888_SkColorType to 3-bytes-per-pixel RGB. - * Alpha channel data is abandoned. - */ -static inline void transform_scanline_RGBX(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const uint32_t* srcP = (const SkPMColor*)src; - for (int i = 0; i < width; i++) { - uint32_t c = *srcP++; - *dst++ = (c >> 0) & 0xFF; - *dst++ = (c >> 8) & 0xFF; - *dst++ = (c >> 16) & 0xFF; - } -} - -/** - * Transform from kBGRA_8888_SkColorType to 3-bytes-per-pixel RGB. - * Alpha channel data is abandoned. - */ -static inline void transform_scanline_BGRX(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const uint32_t* srcP = (const SkPMColor*)src; - for (int i = 0; i < width; i++) { - uint32_t c = *srcP++; - *dst++ = (c >> 16) & 0xFF; - *dst++ = (c >> 8) & 0xFF; - *dst++ = (c >> 0) & 0xFF; - } -} - -/** - * Transform from kARGB_4444_Config to 3-bytes-per-pixel RGB. - * Alpha channel data, if any, is abandoned. - */ -static inline void transform_scanline_444(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const SkPMColor16* srcP = (const SkPMColor16*)src; - for (int i = 0; i < width; i++) { - SkPMColor16 c = *srcP++; - *dst++ = SkPacked4444ToR32(c); - *dst++ = SkPacked4444ToG32(c); - *dst++ = SkPacked4444ToB32(c); - } -} - -/** - * Transform from legacy kPremul, kRGBA_8888_SkColorType to 4-bytes-per-pixel unpremultiplied RGBA. - */ -static inline void transform_scanline_rgbA(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - SkUnpremultiplyRow<false>((uint32_t*) dst, (const uint32_t*) src, width); -} - -/** - * Transform from legacy kPremul, kBGRA_8888_SkColorType to 4-bytes-per-pixel unpremultiplied RGBA. - */ -static inline void transform_scanline_bgrA(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - SkUnpremultiplyRow<true>((uint32_t*) dst, (const uint32_t*) src, width); -} - -template <bool kIsRGBA> -static inline void transform_scanline_unpremultiply_sRGB(void* dst, const void* src, int width) { - SkRasterPipeline p; - p.append(SkRasterPipeline::load_8888, &src); - if (!kIsRGBA) { - p.append(SkRasterPipeline::swap_rb); - } - - p.append_from_srgb(kPremul_SkAlphaType); - p.append(SkRasterPipeline::unpremul); - p.append(SkRasterPipeline::to_srgb); - p.append(SkRasterPipeline::store_8888, &dst); - p.run(0, width); -} - -/** - * Transform from kPremul, kRGBA_8888_SkColorType to 4-bytes-per-pixel unpremultiplied RGBA. - */ -static inline void transform_scanline_srgbA(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - transform_scanline_unpremultiply_sRGB<true>(dst, src, width); -} - -/** - * Transform from kPremul, kBGRA_8888_SkColorType to 4-bytes-per-pixel unpremultiplied RGBA. - */ -static inline void transform_scanline_sbgrA(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - transform_scanline_unpremultiply_sRGB<false>(dst, src, width); -} - -/** - * Transform from kUnpremul, kBGRA_8888_SkColorType to 4-bytes-per-pixel unpremultiplied RGBA. - */ -static inline void transform_scanline_BGRA(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const uint32_t* srcP = (const SkPMColor*)src; - for (int i = 0; i < width; i++) { - uint32_t c = *srcP++; - *dst++ = (c >> 16) & 0xFF; - *dst++ = (c >> 8) & 0xFF; - *dst++ = (c >> 0) & 0xFF; - *dst++ = (c >> 24) & 0xFF; - } -} - -/** - * Transform from kARGB_8888_Config to 4-bytes-per-pixel RGBA, - * with scaling of RGB based on alpha channel. - */ -static inline void transform_scanline_4444(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - const SkPMColor16* srcP = (const SkPMColor16*)src; - const SkUnPreMultiply::Scale* table = SkUnPreMultiply::GetScaleTable(); - - for (int i = 0; i < width; i++) { - SkPMColor16 c = *srcP++; - unsigned a = SkPacked4444ToA32(c); - unsigned r = SkPacked4444ToR32(c); - unsigned g = SkPacked4444ToG32(c); - unsigned b = SkPacked4444ToB32(c); - - if (0 != a && 255 != a) { - SkUnPreMultiply::Scale scale = table[a]; - r = SkUnPreMultiply::ApplyScale(scale, r); - g = SkUnPreMultiply::ApplyScale(scale, g); - b = SkUnPreMultiply::ApplyScale(scale, b); - } - *dst++ = r; - *dst++ = g; - *dst++ = b; - *dst++ = a; - } -} - -/** - * Transform from kRGBA_F16 to 8-bytes-per-pixel RGBA. - */ -static inline void transform_scanline_F16(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - SkRasterPipeline p; - p.append(SkRasterPipeline::load_f16, (const void**) &src); - p.append(SkRasterPipeline::to_srgb); - p.append(SkRasterPipeline::store_u16_be, (void**) &dst); - p.run(0, width); -} - -/** - * Transform from kPremul, kRGBA_F16 to 8-bytes-per-pixel RGBA. - */ -static inline void transform_scanline_F16_premul(char* SK_RESTRICT dst, const char* SK_RESTRICT src, - int width, int, const SkPMColor*) { - SkRasterPipeline p; - p.append(SkRasterPipeline::load_f16, (const void**) &src); - p.append(SkRasterPipeline::unpremul); - p.append(SkRasterPipeline::to_srgb); - p.append(SkRasterPipeline::store_u16_be, (void**) &dst); - p.run(0, width); -} - -/** - * Transform from kRGBA_F16 to 4-bytes-per-pixel RGBA. - */ -static inline void transform_scanline_F16_to_8888(char* SK_RESTRICT dst, - const char* SK_RESTRICT src, int width, int, - const SkPMColor*) { - SkRasterPipeline p; - p.append(SkRasterPipeline::load_f16, (const void**) &src); - p.append(SkRasterPipeline::to_srgb); - p.append(SkRasterPipeline::store_8888, (void**) &dst); - p.run(0, width); -} - -/** - * Transform from kPremul, kRGBA_F16 to 4-bytes-per-pixel RGBA. - */ -static inline void transform_scanline_F16_premul_to_8888(char* SK_RESTRICT dst, - const char* SK_RESTRICT src, int width, - int, const SkPMColor*) { - SkRasterPipeline p; - p.append(SkRasterPipeline::load_f16, (const void**) &src); - p.append(SkRasterPipeline::unpremul); - p.append(SkRasterPipeline::to_srgb); - p.append(SkRasterPipeline::store_8888, (void**) &dst); - p.run(0, width); -} - -static inline sk_sp<SkData> icc_from_color_space(const SkColorSpace& cs) { - SkColorSpaceTransferFn fn; - SkMatrix44 toXYZD50(SkMatrix44::kUninitialized_Constructor); - if (cs.isNumericalTransferFn(&fn) && cs.toXYZD50(&toXYZD50)) { - return SkICC::WriteToICC(fn, toXYZD50); - } - - // TODO: Should we support writing ICC profiles for additional color spaces? - return nullptr; -} - -#endif // SkImageEncoderFns_DEFINED |