Rename AdobeCMYK_to_sRGB() and AdobeCMYK_to_sRGB1() AdobeCMYK_to_sRGB() -> AdobeCmykToStandardRgbF() AdobeCMYK_to_sRGB1() -> AdobeCmykToStandardRgb() Change-Id: I2fcf60769a0aac033f66ddca86a3d1db7c8e032b Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/146930 Reviewed-by: Andy Phan <andyphan@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_devicecs.cpp b/core/fpdfapi/page/cpdf_devicecs.cpp index 1f90ed1..822c521 100644 --- a/core/fpdfapi/page/cpdf_devicecs.cpp +++ b/core/fpdfapi/page/cpdf_devicecs.cpp
@@ -69,7 +69,7 @@ 1.0f - std::min(1.0f, cmyk.yellow + cmyk.key), }; } - return AdobeCMYK_to_sRGB( + return AdobeCmykToStandardRgbF( NormalizeChannel(cmyk.cyan), NormalizeChannel(cmyk.magenta), NormalizeChannel(cmyk.yellow), NormalizeChannel(cmyk.key)); } @@ -130,8 +130,8 @@ } for (const auto& cmyk : cmyk_in.first(static_cast<size_t>(pixels))) { // TODO(tsepez): maybe this is a FX_BGR_STRUCT in reality? - FX_RGB_STRUCT<uint8_t> rgb = - AdobeCMYK_to_sRGB1(cmyk.cyan, cmyk.magenta, cmyk.yellow, cmyk.key); + FX_RGB_STRUCT<uint8_t> rgb = AdobeCmykToStandardRgb( + cmyk.cyan, cmyk.magenta, cmyk.yellow, cmyk.key); rgb_out.front().red = rgb.blue; rgb_out.front().green = rgb.green; rgb_out.front().blue = rgb.red;
diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp index c2d3fed..e43b8b5 100644 --- a/core/fxcodec/progressive_decoder.cpp +++ b/core/fxcodec/progressive_decoder.cpp
@@ -1037,8 +1037,8 @@ pPixelWeights->weights_[j - pPixelWeights->src_start_]; const uint8_t* src_pixel = src_scan + j * src_bytes_per_pixel; FX_RGB_STRUCT<uint8_t> src_rgb = - AdobeCMYK_to_sRGB1(255 - src_pixel[0], 255 - src_pixel[1], - 255 - src_pixel[2], 255 - src_pixel[3]); + AdobeCmykToStandardRgb(255 - src_pixel[0], 255 - src_pixel[1], + 255 - src_pixel[2], 255 - src_pixel[3]); dest_b += pixel_weight * src_rgb.blue; dest_g += pixel_weight * src_rgb.green; dest_r += pixel_weight * src_rgb.red;
diff --git a/core/fxge/dib/cfx_cmyk_to_srgb.cpp b/core/fxge/dib/cfx_cmyk_to_srgb.cpp index 2163d15..c6709aa 100644 --- a/core/fxge/dib/cfx_cmyk_to_srgb.cpp +++ b/core/fxge/dib/cfx_cmyk_to_srgb.cpp
@@ -1667,10 +1667,10 @@ } // namespace -FX_RGB_STRUCT<uint8_t> AdobeCMYK_to_sRGB1(uint8_t c, - uint8_t m, - uint8_t y, - uint8_t k) { +FX_RGB_STRUCT<uint8_t> AdobeCmykToStandardRgb(uint8_t c, + uint8_t m, + uint8_t y, + uint8_t k) { int fix_c = c << 8; int fix_m = m << 8; int fix_y = y << 8; @@ -1737,7 +1737,10 @@ static_cast<uint8_t>(fix_b)}; } -FX_RGB_STRUCT<float> AdobeCMYK_to_sRGB(float c, float m, float y, float k) { +FX_RGB_STRUCT<float> AdobeCmykToStandardRgbF(float c, + float m, + float y, + float k) { // Convert to uint8_t with round-to-nearest. Avoid using FXSYS_roundf because // it is incredibly expensive with VC++ (tested on VC++ 2015) because round() // is very expensive. @@ -1758,7 +1761,7 @@ DCHECK_EQ(y1, FXSYS_roundf(y * 255)); DCHECK_EQ(k1, FXSYS_roundf(k * 255)); - FX_RGB_STRUCT<uint8_t> int_results = AdobeCMYK_to_sRGB1(c1, m1, y1, k1); + FX_RGB_STRUCT<uint8_t> int_results = AdobeCmykToStandardRgb(c1, m1, y1, k1); // Multiply by a constant rather than dividing because division is much // more expensive. static constexpr float kToFloat = 1.0f / 255.0f;
diff --git a/core/fxge/dib/cfx_cmyk_to_srgb.h b/core/fxge/dib/cfx_cmyk_to_srgb.h index a0b30ba..4df7823 100644 --- a/core/fxge/dib/cfx_cmyk_to_srgb.h +++ b/core/fxge/dib/cfx_cmyk_to_srgb.h
@@ -13,15 +13,18 @@ namespace fxge { -FX_RGB_STRUCT<float> AdobeCMYK_to_sRGB(float c, float m, float y, float k); -FX_RGB_STRUCT<uint8_t> AdobeCMYK_to_sRGB1(uint8_t c, - uint8_t m, - uint8_t y, - uint8_t k); +FX_RGB_STRUCT<float> AdobeCmykToStandardRgbF(float c, + float m, + float y, + float k); +FX_RGB_STRUCT<uint8_t> AdobeCmykToStandardRgb(uint8_t c, + uint8_t m, + uint8_t y, + uint8_t k); } // namespace fxge -using fxge::AdobeCMYK_to_sRGB; -using fxge::AdobeCMYK_to_sRGB1; +using fxge::AdobeCmykToStandardRgb; +using fxge::AdobeCmykToStandardRgbF; #endif // CORE_FXGE_DIB_CFX_CMYK_TO_SRGB_H_
diff --git a/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp b/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp index 1e50a7a..941087c 100644 --- a/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp +++ b/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp
@@ -23,8 +23,8 @@ // Iterate through floats by incrementing the representation, as discussed in // https://randomascii.wordpress.com/2012/01/23/stupid-float-tricks-2/ for (Float_t f = kStartValue; f.f < kEndValue; f.i++) { - rgb = AdobeCMYK_to_sRGB(f.f, f.f, f.f, f.f); + rgb = AdobeCmykToStandardRgbF(f.f, f.f, f.f, f.f); } // Check various other 'special' numbers. - rgb = AdobeCMYK_to_sRGB(0.0f, 0.25f, 0.5f, 1.0f); + rgb = AdobeCmykToStandardRgbF(0.0f, 0.25f, 0.5f, 1.0f); }