116 lines
5.6 KiB
Diff
116 lines
5.6 KiB
Diff
From 9c22495e5eeeae9e00a1596720c969656bb8d678 Mon Sep 17 00:00:00 2001
|
|
From: Su_Laus <sulau@freenet.de>
|
|
Date: Fri, 3 Feb 2023 15:31:31 +0100
|
|
Subject: [PATCH] tiffcrop correctly update buffersize after rotateImage()
|
|
fix#520 rotateImage() set up a new buffer and calculates its size
|
|
individually. Therefore, seg_buffs[] size needs to be updated accordingly.
|
|
Before this fix, the seg_buffs buffer size was calculated with a different
|
|
formula than within rotateImage().
|
|
|
|
Closes #520.
|
|
---
|
|
tools/tiffcrop.c | 32 ++++++++++++++++++++------------
|
|
1 file changed, 20 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
|
index 13b6f7b..c114ff3 100644
|
|
--- a/tools/tiffcrop.c
|
|
+++ b/tools/tiffcrop.c
|
|
@@ -526,7 +526,7 @@ static int rotateContigSamples24bits(uint16_t, uint16_t, uint16_t, uint32_t,
|
|
static int rotateContigSamples32bits(uint16_t, uint16_t, uint16_t, uint32_t,
|
|
uint32_t, uint32_t, uint8_t *, uint8_t *);
|
|
static int rotateImage(uint16_t, struct image_data *, uint32_t *, uint32_t *,
|
|
- unsigned char **);
|
|
+ unsigned char **, size_t *);
|
|
static int mirrorImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t,
|
|
unsigned char *);
|
|
static int invertImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t,
|
|
@@ -6525,7 +6525,7 @@ static int correct_orientation(struct image_data *image, unsigned char **work_b
|
|
return (-1);
|
|
}
|
|
|
|
- if (rotateImage(rotation, image, &image->width, &image->length, work_buff_ptr))
|
|
+ if (rotateImage(rotation, image, &image->width, &image->length, work_buff_ptr, NULL))
|
|
{
|
|
TIFFError ("correct_orientation", "Unable to rotate image");
|
|
return (-1);
|
|
@@ -7707,16 +7707,19 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
|
|
|
|
if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */
|
|
{
|
|
+ /* rotateImage() set up a new buffer and calculates its size
|
|
+ * individually. Therefore, seg_buffs size needs to be updated
|
|
+ * accordingly. */
|
|
+ size_t rot_buf_size = 0;
|
|
if (rotateImage(crop->rotation, image, &crop->combined_width,
|
|
- &crop->combined_length, &crop_buff))
|
|
+ &crop->combined_length, &crop_buff, &rot_buf_size))
|
|
{
|
|
TIFFError("processCropSelections",
|
|
"Failed to rotate composite regions by %"PRIu32" degrees", crop->rotation);
|
|
return (-1);
|
|
}
|
|
seg_buffs[0].buffer = crop_buff;
|
|
- seg_buffs[0].size = (((crop->combined_width * image->bps + 7 ) / 8)
|
|
- * image->spp) * crop->combined_length;
|
|
+ seg_buffs[0].size = rot_buf_size;
|
|
}
|
|
}
|
|
else /* Separated Images */
|
|
@@ -7816,9 +7819,13 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
|
|
{
|
|
/* rotateImage() changes image->width, ->length, ->xres and ->yres, what it schouldn't do here, when more than one section is processed.
|
|
* ToDo: Therefore rotateImage() and its usage has to be reworked (e.g. like mirrorImage()) !!
|
|
- */
|
|
- if (rotateImage(crop->rotation, image, &crop->regionlist[i].width,
|
|
- &crop->regionlist[i].length, &crop_buff))
|
|
+ * Furthermore, rotateImage() set up a new buffer and calculates
|
|
+ * its size individually. Therefore, seg_buffs size needs to be
|
|
+ * updated accordingly. */
|
|
+ size_t rot_buf_size = 0;
|
|
+ if (rotateImage(
|
|
+ crop->rotation, image, &crop->regionlist[i].width,
|
|
+ &crop->regionlist[i].length, &crop_buff, &rot_buf_size))
|
|
{
|
|
TIFFError("processCropSelections",
|
|
"Failed to rotate crop region by %"PRIu16" degrees", crop->rotation);
|
|
@@ -7829,8 +7836,7 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
|
|
crop->combined_width = total_width;
|
|
crop->combined_length = total_length;
|
|
seg_buffs[i].buffer = crop_buff;
|
|
- seg_buffs[i].size = (((crop->regionlist[i].width * image->bps + 7 ) / 8)
|
|
- * image->spp) * crop->regionlist[i].length;
|
|
+ seg_buffs[i].size = rot_buf_size;
|
|
}
|
|
} /* for crop->selections loop */
|
|
} /* Separated Images (else case) */
|
|
@@ -7950,7 +7956,7 @@ createCroppedImage(struct image_data *image, struct crop_mask *crop,
|
|
if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */
|
|
{
|
|
if (rotateImage(crop->rotation, image, &crop->combined_width,
|
|
- &crop->combined_length, crop_buff_ptr))
|
|
+ &crop->combined_length, crop_buff_ptr, NULL))
|
|
{
|
|
TIFFError("createCroppedImage",
|
|
"Failed to rotate image or cropped selection by %"PRIu16" degrees", crop->rotation);
|
|
@@ -8613,7 +8619,7 @@ rotateContigSamples32bits(uint16_t rotation, uint16_t spp, uint16_t bps, uint32_
|
|
/* Rotate an image by a multiple of 90 degrees clockwise */
|
|
static int
|
|
rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width,
|
|
- uint32_t *img_length, unsigned char **ibuff_ptr)
|
|
+ uint32_t *img_length, unsigned char **ibuff_ptr, size_t *rot_buf_size)
|
|
{
|
|
int shift_width;
|
|
uint32_t bytes_per_pixel, bytes_per_sample;
|
|
@@ -8664,6 +8670,8 @@ rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width,
|
|
return (-1);
|
|
}
|
|
_TIFFmemset(rbuff, '\0', buffsize + NUM_BUFF_OVERSIZE_BYTES);
|
|
+ if (rot_buf_size != NULL)
|
|
+ *rot_buf_size = buffsize;
|
|
|
|
ibuff = *ibuff_ptr;
|
|
switch (rotation)
|
|
--
|
|
2.27.0
|