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

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-11-08 23:33:49 +01:00
commit 88d8252952
137 changed files with 9637 additions and 7950 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
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_g /= (GRID_SIZE * GRID_SIZE);
total_b /= (GRID_SIZE * GRID_SIZE);
total_r /= px_cnt;
total_g /= px_cnt;
total_b /= px_cnt;
/* 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()`) */
SDL_GetRGB(api->getpixel(square, sqx, sqy), square->format, &or, &og, &ob);
pixel = SDL_MapRGB(square->format,
min((Uint8) (r * 1.2), or),
min((Uint8) (g * 1.2), og),
min((Uint8) (b * 1.2), ob)
min((Uint8) (r * 2.0), or),
min((Uint8) (g * 2.0), og),
min((Uint8) (b * 2.0), ob)
);
api->putpixel(square, sqx, sqy, pixel);
}

4
magic/src/lightning.c
View file

@ -3,7 +3,7 @@
Draws a lightning strike between the click
and drag+release positions.
Last modified: 2021.10.24
Last modified: 2021.11.07
*/
#include <stdio.h>
@ -85,7 +85,7 @@ int lightning_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UN
char *lightning_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return strdup(gettext("Click, drag, and release to a lightning bolt between two points."));
return strdup(gettext("Click, drag, and release to draw a lightning bolt between two points."));
}
int lightning_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)