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

thumbnail2() - ceil() the new_x & new_y calculations

Browse source 
I noticed that buttonsize=90 or =91 would end up with UI buttons
images ere one pixel smaller (89x89 or 90x90, respectively) than
expected, hence they layout would end up with one row and one
column of unused pixels between them.  Any button content (e.g.
stamp thumbnails) that might render into the full size would end
up leaving garbage pixels behind.

Applying ceil() to the new_x and new_y (but then making sure they do
not exceed the requested max_x and max_y) calculated sizes inside the
thumbnail2() function.  (We do not simply use max_x and max_y directly,
because we are usually trying to maintain the original image's aspect
ratio.)
This commit is contained in:
Bill Kendrick 2023-05-04 23:29:39 -07:00
parent aa2235c8ba
commit 3f5bc2b554
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/CHANGES.txt
View file

@ -142,6 +142,10 @@ https://tuxpaint.org/
seeing no stamps between the up/down scroll buttons!)
Bill Kendrick <bill@newbreedsoftware.com>
* Some button sizes could cause buttons to render with gaps
(e.g. 90 and 91), where 'garbage' graphics could appear.
Bill Kendrick <bill@newbreedsoftware.com>
* Ports & Building:
-----------------
* Created "src/indent.sh", to run 'indent' against source files.

18
src/tuxpaint.c
View file

@ -803,7 +803,7 @@ static float render_scale; /* Scale factor for the render */
static int button_w; /* was 48 */
static int button_h; /* was 48 */
static int button_size_auto = 0; /* if the size of buttons should be autocalculated */
static float button_scale; /* scale factor to be applied to the size of buttons */
static float button_scale; /* scale factor to be applied to the size of buttons */
static int color_button_w; /* was 32 */
static int color_button_h; /* was 48 */
static int colors_rows;
@ -860,7 +860,7 @@ static void set_max_buttonscale(void)
max_h = (float)WINDOW_HEIGHT / (40 + (6 * 48) + (gd_colors.rows * 48) + 56);
button_scale = min(max_w, max_h);
fprintf(stderr, "Will use a button size of %d\n", (int)(button_scale * ORIGINAL_BUTTON_SIZE));
fprintf(stderr, "Will use a button size of %d (scale = %f)\n", (int)(button_scale * ORIGINAL_BUTTON_SIZE), button_scale);
}
/**
@ -11458,8 +11458,13 @@ static SDL_Surface *thumbnail2(SDL_Surface * src, int max_x, int max_y, int keep
xscale = (float)((float)src->w / (float)sx);
}
new_x = (int)((float)src->w / xscale);
new_y = (int)((float)src->h / yscale);
new_x = (int)ceil((float)src->w / xscale);
new_y = (int)ceil((float)src->h / yscale);
if (new_x > max_x)
new_x = max_x;
if (new_y > max_y)
new_y = max_y;
if (!keep_aspect)
{
@ -27809,11 +27814,14 @@ static void setup_config(char *argv[])
fprintf(stderr, "Button size (now %s) must be between 24 and 192.\n", tmpcfg.button_size);
exit(1);
}
button_scale = strtof(tmpcfg.button_size, NULL) / ORIGINAL_BUTTON_SIZE;
button_scale = (float) strtof(tmpcfg.button_size, NULL) / (float) ORIGINAL_BUTTON_SIZE;
DEBUG_PRINTF("Button size %s requested = %d (scale = %f)\n", tmpcfg.button_size, (int)(button_scale * ORIGINAL_BUTTON_SIZE), button_scale);
}
}
else
{
button_scale = 1;
}
if (tmpcfg.colors_rows)
{
if (strtof(tmpcfg.colors_rows, NULL) > 3)