diff options
| author | Luke Deller <luke@deller.id.au> | 2013-03-09 01:26:56 +1100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-11 14:54:57 +0000 |
| commit | 77e21bb36a2cdaaa0f4049dee0d45c5b2325c6e9 (patch) | |
| tree | 9ae1c4c5f567622d4311b09a7555555e124579e1 /tools/inc | |
| parent | Updated core (diff) | |
| download | core-77e21bb36a2cdaaa0f4049dee0d45c5b2325c6e9.tar.gz core-77e21bb36a2cdaaa0f4049dee0d45c5b2325c6e9.zip | |
Change definition of "dark" colour for fdo#61993
- Increase the threshold for "dark" colours from Luminosity<=38 to
Luminosity<=60.
This makes LibreOffice align more closely with MS Word when
considering whether "automatic" font colour should be black or white,
a decision that is based on whether the background colour is "dark".
Beware that this also affects other areas.
- Fix the coefficients for GetLuminosity which appeared to be off
by one according to the "Rec 601" coefficients for Luma quoted at
http://en.wikipedia.org/wiki/Luma_%28video%29
Change-Id: I0af1f77909713e3db5ea8ee98456146569679594
Reviewed-on: https://gerrit.libreoffice.org/2601
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'tools/inc')
| -rw-r--r-- | tools/inc/tools/color.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index 823f341e5e67..911088b9cad1 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -198,9 +198,9 @@ inline sal_Bool Color::IsRGBEqual( const Color& rColor ) const inline sal_uInt8 Color::GetLuminance() const { - return( (sal_uInt8) ( ( COLORDATA_BLUE( mnColor ) * 28UL + + return( (sal_uInt8) ( ( COLORDATA_BLUE( mnColor ) * 29UL + COLORDATA_GREEN( mnColor ) * 151UL + - COLORDATA_RED( mnColor ) * 77UL ) >> 8UL ) ); + COLORDATA_RED( mnColor ) * 76UL ) >> 8UL ) ); } inline void Color::Merge( const Color& rMergeColor, sal_uInt8 cTransparency ) |