notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oh yeah, we already have sRGB<->linear conversions, currently used by some Magic tools. Now using it instead of ceil(pow()) and pow() for gamma-correction in thumbnail2(). (As they're look-ups, they're faster, too!) Thanks for the reminder, Albert C.!

Browse source
This commit is contained in:
William Kendrick 2011-07-26 20:46:21 +00:00
parent 915e234f20
commit 0067cbd2af
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - July 25, 2011
June 14, 2002 - July 26, 2011
*/
@ -9234,9 +9234,12 @@ static SDL_Surface *thumbnail2(SDL_Surface * src, int max_x, int max_y,
src->format, &r, &g, &b, &a);
#ifdef GAMMA_CORRECTED_THUMBNAILS
tr = tr + pow((float)r, gamma);
tb = tb + pow((float)b, gamma);
tg = tg + pow((float)g, gamma);
// tr = tr + pow((float)r, gamma);
// tb = tb + pow((float)b, gamma);
// tg = tg + pow((float)g, gamma);
tr = tr + sRGB_to_linear_table[r];
tg = tg + sRGB_to_linear_table[g];
tb = tb + sRGB_to_linear_table[b];
#else
tr = tr + r;
tb = tb + b;
@ -9256,9 +9259,12 @@ static SDL_Surface *thumbnail2(SDL_Surface * src, int max_x, int max_y,
ta = ta / tmp;
#ifdef GAMMA_CORRECTED_THUMBNAILS
tr = ceil(pow(tr, gamma_invert));
tg = ceil(pow(tg, gamma_invert));
tb = ceil(pow(tb, gamma_invert));
// tr = ceil(pow(tr, gamma_invert));
// tg = ceil(pow(tg, gamma_invert));
// tb = ceil(pow(tb, gamma_invert));
tr = linear_to_sRGB(tr);
tg = linear_to_sRGB(tg);
tb = linear_to_sRGB(tb);
#endif
if (keep_alpha == 0 && s->format->Amask != 0)