m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load_PNG(): load correctly aspect ratio

Browse Source
This commit is contained in:
Thomas Bernard 2018-03-05 23:31:07 +01:00
parent 8dfd6d6c97
commit 4338d31f04
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fileformats.c
View File

@ -6081,6 +6081,7 @@ static void Load_PNG_Sub(T_IO_Context * context, FILE * file)
|| color_type == PNG_COLOR_TYPE_RGB_ALPHA || color_type == PNG_COLOR_TYPE_RGB_ALPHA
) )
{ {
enum PIXEL_RATIO ratio = PIXEL_SIMPLE;
int num_text; int num_text;
png_text *text_ptr; png_text *text_ptr;
@ -6111,20 +6112,13 @@ static void Load_PNG_Sub(T_IO_Context * context, FILE * file)
// WIDE or TALL pixels // WIDE or TALL pixels
if (res_x>0 && res_y>0) if (res_x>0 && res_y>0)
{ {
if (res_y/res_x>1) if (res_y * 10 > res_x * 12) // X/Y < 1/1.2
{ ratio = PIXEL_WIDE;
context->Ratio=PIXEL_WIDE; else if (res_x * 10 > res_y * 12) // X/Y > 1.2
} ratio = PIXEL_TALL;
else if (res_x/res_y>1)
{
context->Ratio=PIXEL_TALL;
}
} }
} }
if (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA) Pre_load(context,png_get_image_width(png_ptr,info_ptr),png_get_image_height(png_ptr,info_ptr),File_length_file(file),FORMAT_PNG,ratio,bpp);
Pre_load(context,png_get_image_width(png_ptr,info_ptr),png_get_image_height(png_ptr,info_ptr),File_length_file(file),FORMAT_PNG,PIXEL_SIMPLE,bpp);
else
Pre_load(context,png_get_image_width(png_ptr,info_ptr),png_get_image_height(png_ptr,info_ptr),File_length_file(file),FORMAT_PNG,context->Ratio,bpp);
if (File_error==0) if (File_error==0)
{ {