github.com/brouhaha.tumble
1
0
Fork 0
mirror of synced 2026-04-07 14:14:08 +00:00
Code Issues Releases Wiki Activity

Fix problem with image_info->{width,height}_samples not being set. Add rotation.

Browse Source
This commit is contained in:
Eric Smith
2017-06-09 22:02:47 -06:00
parent cf429f859f
commit d526c45a52
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tumble_pbm.c
View File

@@ -109,16 +109,32 @@ static bool get_pbm_image_info (int image,
{
double x_resolution = 300;
double y_resolution = 300;
double dest_x_resolution, dest_y_resolution;
/* $$$ need to handle rotation! */
if (input_attributes.has_resolution)
{
x_resolution = input_attributes.x_resolution;
y_resolution = input_attributes.y_resolution;
}
image_info->width_points = (pbm.cols / x_resolution) * POINTS_PER_INCH;
image_info->height_points = (pbm.rows / y_resolution) * POINTS_PER_INCH;
if ((input_attributes.rotation == 90) || (input_attributes.rotation == 270))
{
image_info->width_samples = pbm.rows;
image_info->height_samples = pbm.cols;
dest_x_resolution = y_resolution;
dest_y_resolution = x_resolution;
}
else
{
image_info->width_samples = pbm.cols;
image_info->height_samples = pbm.rows;
dest_x_resolution = x_resolution;
dest_y_resolution = y_resolution;
}
image_info->width_points = (image_info->width_samples / dest_x_resolution) * POINTS_PER_INCH;
image_info->height_points = (image_info->height_samples / dest_y_resolution) * POINTS_PER_INCH;
if ((image_info->height_points > PAGE_MAX_POINTS) ||
(image_info->width_points > PAGE_MAX_POINTS))
@@ -191,10 +207,7 @@ static bool process_pbm_image (int image, /* range 1 .. n */
input_attributes);
#endif
#if 0
rotate_bitmap (bitmap,
input_attributes);
#endif
rotate_bitmap (bitmap, input_attributes.rotation);
pdf_write_g4_fax_image (page,
position.x, position.y,