sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

followup to f10939fac6 - same small optimization in hsl as hsv

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-14 17:04:44 -08:00
parent 1ae4a03f68
commit a10511f6b4
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boost/gil/extension/toolbox/hsl.hpp
View file

@ -59,9 +59,18 @@ struct default_color_converter_impl< rgb_t, hsl_t >
bits32f temp_blue = channel_convert<bits32f>( get_color( src, blue_t() ));
bits32f hue, saturation, lightness;
bits32f min_color, max_color;
bits32f min_color = std::min( temp_red, std::min( temp_green, temp_blue ));
bits32f max_color = std::max( temp_red, std::max( temp_green, temp_blue ));
if( temp_red < temp_green )
{
min_color = std::min( temp_blue, temp_red );
max_color = std::max( temp_blue, temp_green );
}
else
{
min_color = std::min( temp_blue, temp_green );
max_color = std::max( temp_blue, temp_red );
}
if ( max_color - min_color < 0.001 )
{

6
boost/gil/extension/toolbox/hsv.hpp
View file

@ -62,11 +62,13 @@ struct default_color_converter_impl< rgb_t, hsv_t >
bits32f hue, saturation, value;
bits32f min_color, max_color;
if( temp_red < temp_green ) {
if( temp_red < temp_green )
{
min_color = std::min( temp_blue, temp_red );
max_color = std::max( temp_blue, temp_green );
}
else {
else
{
min_color = std::min( temp_blue, temp_green );
max_color = std::max( temp_blue, temp_red );
}