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

Halftone was coming out too dark

Browse source 
Not sure what I broke, but attempting to fix it.
This commit is contained in:
Bill Kendrick 2021-11-07 19:51:08 -08:00
parent fbf206d17c
commit e3c7b3b5e7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
magic/src/halftone.c
View file

@ -1,6 +1,6 @@
/* halftone.c /* halftone.c
Last modified: 2021.10.24 Last modified: 2021.11.07
*/ */
@ -304,9 +304,9 @@ void halftone_line_callback(void *ptr, int which ATTRIBUTE_UNUSED,
} }
} }
total_r /= (GRID_SIZE * GRID_SIZE); total_r /= px_cnt;
total_g /= (GRID_SIZE * GRID_SIZE); total_g /= px_cnt;
total_b /= (GRID_SIZE * GRID_SIZE); total_b /= px_cnt;
/* Convert the average color from RGB to CMYK values, for 'painting' later */ /* Convert the average color from RGB to CMYK values, for 'painting' later */
@ -341,9 +341,9 @@ void halftone_line_callback(void *ptr, int which ATTRIBUTE_UNUSED,
(since the target is RGB, we use `min()`) */ (since the target is RGB, we use `min()`) */
SDL_GetRGB(api->getpixel(square, sqx, sqy), square->format, &or, &og, &ob); SDL_GetRGB(api->getpixel(square, sqx, sqy), square->format, &or, &og, &ob);
pixel = SDL_MapRGB(square->format, pixel = SDL_MapRGB(square->format,
min((Uint8) (r * 1.2), or), min((Uint8) (r * 2.0), or),
min((Uint8) (g * 1.2), og), min((Uint8) (g * 2.0), og),
min((Uint8) (b * 1.2), ob) min((Uint8) (b * 2.0), ob)
); );
api->putpixel(square, sqx, sqy, pixel); api->putpixel(square, sqx, sqy, pixel);
} }