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

Mend aspect ratio bug in thumbnail function

Browse source 
SVG-based Stamp images which were not square would get stretched and
look weird in the selector on the right.
This commit is contained in:
Bill Kendrick 2023-03-19 11:15:48 -07:00
parent 2f7971c8b9
commit df65409671
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - March 15, 2023 June 14, 2002 - March 19, 2023
*/ */
#include "platform.h" #include "platform.h"
@ -9367,7 +9367,7 @@ static void get_stamp_thumb(stamp_type * sd, int process_sound)
w = 40; w = 40;
h = 40; h = 40;
int ww = (40 * button_h) / ORIGINAL_BUTTON_SIZE; int ww = (40 * button_w) / ORIGINAL_BUTTON_SIZE;
int hh = (40 * button_h) / ORIGINAL_BUTTON_SIZE; int hh = (40 * button_h) / ORIGINAL_BUTTON_SIZE;
if (bigimg) if (bigimg)
{ {
@ -11911,12 +11911,16 @@ static SDL_Surface *thumbnail2(SDL_Surface * src, int max_x, int max_y,
} }
else else
{ {
DEBUG_PRINTF("thumbnail2() asked for %d x %d => %d x %d, with aspect\n", src->w, src->h, max_x, max_y); float scale_factor;
int sx, sy;
yscale = (float) ((float) src->h / (float) max_y); scale_factor = pick_best_scape(src->w, src->h, max_x, max_y);
xscale = (float) ((float) src->w / (float) max_x);
if (yscale > xscale) sx = ((float) src->w * scale_factor);
xscale = yscale; sy = ((float) src->h * scale_factor);
yscale = (float) ((float) src->h / (float) sy);
xscale = (float) ((float) src->w / (float) sx);
} }
new_x = (int) ((float) src->w / xscale); new_x = (int) ((float) src->w / xscale);