Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2259)

Unified Diff: core/fxcodec/codec/fx_codec_icc.cpp

Issue 2466203002: Fix founding difference in pdfium_test on AdobeCMYK_to_sRGB (Closed)
Patch Set: Remove blank line Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | core/fxcodec/codec/fx_codec_jpx_unittest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxcodec/codec/fx_codec_icc.cpp
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp
index 8e48bfbfeaa935458ba8240351820ecaec4e880a..f0ea6bb43c0c463a4a09115625a5d41f2de836a4 100644
--- a/core/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/fx_codec_icc.cpp
@@ -1663,17 +1663,17 @@ void AdobeCMYK_to_sRGB(FX_FLOAT c,
// Convert to uint8_t with round-to-nearest. Avoid using FXSYS_round because
// it is incredibly expensive with VC++ (tested on VC++ 2015) because round()
// is very expensive.
- // Adding 0.5f and truncating can round the wrong direction in some edge
- // cases but these do not matter in this context. For instance, the float that
- // is one ULP (unit in the last place) before 0.5 should round to zero but
- // this will round it to one. These edge cases are never hit in this function
- // due to the very limited precision of the input integers.
- // This method also doesn't handle negative or extremely large numbers, but
- // those are not needed here.
- uint8_t c1 = int(c * 255.f + 0.5f);
- uint8_t m1 = int(m * 255.f + 0.5f);
- uint8_t y1 = int(y * 255.f + 0.5f);
- uint8_t k1 = int(k * 255.f + 0.5f);
+ // The 'magic' value of 0.49999997f, the float that precedes 0.5f, was chosen
+ // because it gives identical results to FXSYS_round(). Using the constant
+ // 0.5f gives different results (1 instead of 0) for one value, 0.0019607842.
+ // That value is close to the cusp but zero is the correct answer, and
+ // getting the same answer as before is desirable.
+ // All floats from 0.0 to 1.0 were tested and now give the same results.
+ const float rounding_offset = 0.49999997f;
+ uint8_t c1 = int(c * 255.f + rounding_offset);
+ uint8_t m1 = int(m * 255.f + rounding_offset);
+ uint8_t y1 = int(y * 255.f + rounding_offset);
+ uint8_t k1 = int(k * 255.f + rounding_offset);
ASSERT(c1 == FXSYS_round(c * 255));
ASSERT(m1 == FXSYS_round(m * 255));
« no previous file with comments | « no previous file | core/fxcodec/codec/fx_codec_jpx_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698