1 files changed, 42 insertions, 44 deletions

diff --git a/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch b/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch
index 07acf5eb90..7c4feabc38 100644
--- a/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch
+++ b/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch
@@ -1,7 +1,8 @@
-From e319508023580e2f70e6e626f745b5b2a1707313 Mon Sep 17 00:00:00 2001
+From 0ab805f46f68500da3b49d6f89380bab169bf6bb Mon Sep 17 00:00:00 2001
 From: Su Laus <sulau@freenet.de>
 Date: Tue, 10 May 2022 20:03:17 +0000
 Subject: [PATCH] tiffcrop: Fix issue #330 and some more from 320 to 349
+
 Upstream-Status: Backport
 Signed-off-by: Zheng Qiu <zheng.qiu@windriver.com>
 ---
@@ -9,7 +10,7 @@ Signed-off-by: Zheng Qiu <zheng.qiu@windriver.com>
  1 file changed, 210 insertions(+), 72 deletions(-)
 
 diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index 77cf6ed1..791ec5e7 100644
+index 99e4208..b596f9e 100644
 --- a/tools/tiffcrop.c
 +++ b/tools/tiffcrop.c
 @@ -63,20 +63,24 @@
@@ -67,7 +68,7 @@ index 77cf6ed1..791ec5e7 100644
  ;
  
  /* This function could be modified to pass starting sample offset 
-@@ -2121,6 +2131,15 @@ void  process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32
+@@ -2123,6 +2133,15 @@ void  process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32
                 /*NOTREACHED*/
        }
      }
@@ -83,7 +84,7 @@ index 77cf6ed1..791ec5e7 100644
    }  /* end process_command_opts */
  
  /* Start a new output file if one has not been previously opened or
-@@ -2746,7 +2765,7 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2748,7 +2767,7 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
                             tsample_t count, uint32_t start, uint32_t end)
    {
    int i, bytes_per_sample, sindex;
@@ -92,7 +93,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t src_byte /*, src_bit */;
    uint8_t *src = in;
    uint8_t *dst = out;
-@@ -2757,6 +2776,10 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2759,6 +2778,10 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -103,7 +104,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamplesBytes", 
-@@ -2769,6 +2792,9 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2771,6 +2794,9 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -113,7 +114,7 @@ index 77cf6ed1..791ec5e7 100644
  
    dst_rowsize = (bps * (end - start) * count) / 8;
  
-@@ -2812,7 +2838,7 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2814,7 +2840,7 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
                             tsample_t count, uint32_t start, uint32_t end)
    {
    int    ready_bits = 0, sindex = 0;
@@ -122,7 +123,7 @@ index 77cf6ed1..791ec5e7 100644
    uint8_t  maskbits = 0, matchbits = 0;
    uint8_t  buff1 = 0, buff2 = 0;
    uint8_t *src = in;
-@@ -2824,6 +2850,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2826,6 +2852,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -133,7 +134,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamples8bits", 
-@@ -2836,7 +2866,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2838,7 +2868,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -145,7 +146,7 @@ index 77cf6ed1..791ec5e7 100644
    ready_bits = 0;
    maskbits =  (uint8_t)-1 >> (8 - bps);
    buff1 = buff2 = 0;
-@@ -2889,7 +2922,7 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2891,7 +2924,7 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
                              tsample_t count, uint32_t start, uint32_t end)
    {
    int    ready_bits = 0, sindex = 0;
@@ -154,7 +155,7 @@ index 77cf6ed1..791ec5e7 100644
    uint16_t maskbits = 0, matchbits = 0;
    uint16_t buff1 = 0, buff2 = 0;
    uint8_t  bytebuff = 0;
-@@ -2902,6 +2935,10 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2904,6 +2937,10 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -165,7 +166,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamples16bits", 
-@@ -2914,6 +2951,9 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2916,6 +2953,9 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -175,7 +176,7 @@ index 77cf6ed1..791ec5e7 100644
  
    ready_bits = 0;
    maskbits = (uint16_t)-1 >> (16 - bps);
-@@ -2978,7 +3018,7 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2980,7 +3020,7 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
                              tsample_t count, uint32_t start, uint32_t end)
    {
    int    ready_bits = 0, sindex = 0;
@@ -184,7 +185,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t maskbits = 0, matchbits = 0;
    uint32_t buff1 = 0, buff2 = 0;
    uint8_t  bytebuff1 = 0, bytebuff2 = 0;
-@@ -2991,6 +3031,10 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -2993,6 +3033,10 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -195,7 +196,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamples24bits", 
-@@ -3003,6 +3047,9 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3005,6 +3049,9 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -205,7 +206,7 @@ index 77cf6ed1..791ec5e7 100644
  
    ready_bits = 0;
    maskbits =  (uint32_t)-1 >> (32 - bps);
-@@ -3087,7 +3134,7 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3089,7 +3136,7 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
                              tsample_t count, uint32_t start, uint32_t end)
    {
    int    ready_bits = 0, sindex = 0 /*, shift_width = 0 */;
@@ -214,7 +215,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t longbuff1 = 0, longbuff2 = 0;
    uint64_t maskbits = 0, matchbits = 0;
    uint64_t buff1 = 0, buff2 = 0, buff3 = 0;
-@@ -3102,6 +3149,10 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3104,6 +3151,10 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
      }
  
  
@@ -225,7 +226,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamples32bits", 
-@@ -3114,6 +3165,9 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3116,6 +3167,9 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -235,7 +236,7 @@ index 77cf6ed1..791ec5e7 100644
  
    /* shift_width = ((bps + 7) / 8) + 1; */ 
    ready_bits = 0;
-@@ -3193,7 +3247,7 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3195,7 +3249,7 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
                                    int shift)
    {
    int    ready_bits = 0, sindex = 0;
@@ -244,7 +245,7 @@ index 77cf6ed1..791ec5e7 100644
    uint8_t  maskbits = 0, matchbits = 0;
    uint8_t  buff1 = 0, buff2 = 0;
    uint8_t *src = in;
-@@ -3205,6 +3259,10 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3207,6 +3261,10 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -255,7 +256,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamplesShifted8bits", 
-@@ -3217,6 +3275,9 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3219,6 +3277,9 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -265,7 +266,7 @@ index 77cf6ed1..791ec5e7 100644
  
    ready_bits = shift;
    maskbits =  (uint8_t)-1 >> (8 - bps);
-@@ -3273,7 +3334,7 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3275,7 +3336,7 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
                                     int shift)
    {
    int    ready_bits = 0, sindex = 0;
@@ -274,7 +275,7 @@ index 77cf6ed1..791ec5e7 100644
    uint16_t maskbits = 0, matchbits = 0;
    uint16_t buff1 = 0, buff2 = 0;
    uint8_t  bytebuff = 0;
-@@ -3286,6 +3347,10 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3288,6 +3349,10 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -285,7 +286,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamplesShifted16bits", 
-@@ -3298,6 +3363,9 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3300,6 +3365,9 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -295,7 +296,7 @@ index 77cf6ed1..791ec5e7 100644
  
    ready_bits = shift;
    maskbits = (uint16_t)-1 >> (16 - bps);
-@@ -3363,7 +3431,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3365,7 +3433,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
                                     int shift)
    {
    int    ready_bits = 0, sindex = 0;
@@ -304,7 +305,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t maskbits = 0, matchbits = 0;
    uint32_t buff1 = 0, buff2 = 0;
    uint8_t  bytebuff1 = 0, bytebuff2 = 0;
-@@ -3376,6 +3444,16 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3378,6 +3446,16 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
      return (1);
      }
  
@@ -321,7 +322,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamplesShifted24bits", 
-@@ -3388,6 +3466,9 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3390,6 +3468,9 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -331,7 +332,7 @@ index 77cf6ed1..791ec5e7 100644
  
    ready_bits = shift;
    maskbits =  (uint32_t)-1 >> (32 - bps);
-@@ -3449,7 +3530,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3451,7 +3532,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols,
      buff2 = (buff2 << 8);
      bytebuff2 = bytebuff1;
      ready_bits -= 8;
@@ -340,7 +341,7 @@ index 77cf6ed1..791ec5e7 100644
     
    return (0);
    } /* end extractContigSamplesShifted24bits */
-@@ -3461,7 +3542,7 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3463,7 +3544,7 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
                                     int shift)
    {
    int    ready_bits = 0, sindex = 0 /*, shift_width = 0 */;
@@ -349,7 +350,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t longbuff1 = 0, longbuff2 = 0;
    uint64_t maskbits = 0, matchbits = 0;
    uint64_t buff1 = 0, buff2 = 0, buff3 = 0;
-@@ -3476,6 +3557,10 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3478,6 +3559,10 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
      }
  
  
@@ -360,7 +361,7 @@ index 77cf6ed1..791ec5e7 100644
    if ((start > end) || (start > cols))
      {
      TIFFError ("extractContigSamplesShifted32bits", 
-@@ -3488,6 +3573,9 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
+@@ -3490,6 +3575,9 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols,
                 "Invalid end column value %"PRIu32" ignored", end);
      end = cols;
      }
@@ -370,7 +371,7 @@ index 77cf6ed1..791ec5e7 100644
  
    /* shift_width = ((bps + 7) / 8) + 1; */ 
    ready_bits = shift;
-@@ -5429,7 +5517,7 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5431,7 +5519,7 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
    {
    struct offset offsets;
    int    i;
@@ -379,7 +380,7 @@ index 77cf6ed1..791ec5e7 100644
    uint32_t seg, total, need_buff = 0;
    uint32_t buffsize;
    uint32_t zwidth, zlength;
-@@ -5510,8 +5598,13 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5512,8 +5600,13 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
      seg = crop->zonelist[j].position;
      total = crop->zonelist[j].total;
  
@@ -394,7 +395,7 @@ index 77cf6ed1..791ec5e7 100644
          continue;
      }
  
-@@ -5524,17 +5617,23 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5526,17 +5619,23 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
  
             crop->regionlist[i].x1 = offsets.startx + 
                                    (uint32_t)(offsets.crop_width * 1.0 * (seg - 1) / total);
@@ -428,7 +429,7 @@ index 77cf6ed1..791ec5e7 100644
             zwidth = crop->regionlist[i].x2 - crop->regionlist[i].x1  + 1;
  
            /* This is passed to extractCropZone or extractCompositeZones */
-@@ -5549,22 +5648,27 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5551,22 +5650,27 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
            crop->regionlist[i].x1 = offsets.startx;
             crop->regionlist[i].x2 = offsets.endx;
  
@@ -471,7 +472,7 @@ index 77cf6ed1..791ec5e7 100644
             zlength = crop->regionlist[i].y2 - crop->regionlist[i].y1 + 1;
  
            /* This is passed to extractCropZone or extractCompositeZones */
-@@ -5575,32 +5679,42 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5577,32 +5681,42 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
             crop->combined_width = (uint32_t)zwidth;
             break;
        case EDGE_RIGHT: /* zones from right to left, length from top */
@@ -539,7 +540,7 @@ index 77cf6ed1..791ec5e7 100644
        case EDGE_TOP: /* width from left, zones from top to bottom */
        default:
             zwidth = offsets.crop_width;
-@@ -5608,6 +5722,14 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5610,6 +5724,14 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
             crop->regionlist[i].x2 = offsets.endx;
  
             crop->regionlist[i].y1 = offsets.starty + (uint32_t)(offsets.crop_length * 1.0 * (seg - 1) / total);
@@ -554,7 +555,7 @@ index 77cf6ed1..791ec5e7 100644
             test = offsets.starty + (uint32_t)(offsets.crop_length * 1.0 * seg / total);
             if (test < 1 )
               crop->regionlist[i].y2 = 0;
-@@ -5618,6 +5740,18 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
+@@ -5620,6 +5742,18 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt
               else
                crop->regionlist[i].y2 = test - 1;
              }
@@ -573,7 +574,7 @@ index 77cf6ed1..791ec5e7 100644
             zlength = crop->regionlist[i].y2 - crop->regionlist[i].y1 + 1;
  
            /* This is passed to extractCropZone or extractCompositeZones */
-@@ -7551,7 +7685,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
+@@ -7543,7 +7677,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
      total_width = total_length = 0;
      for (i = 0; i < crop->selections; i++)
        {
@@ -583,7 +584,7 @@ index 77cf6ed1..791ec5e7 100644
        crop_buff = seg_buffs[i].buffer; 
        if (!crop_buff)
          crop_buff = (unsigned char *)limitMalloc(cropsize);
-@@ -7640,6 +7775,9 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
+@@ -7632,6 +7767,9 @@ 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 */
          {
@@ -593,7 +594,7 @@ index 77cf6ed1..791ec5e7 100644
         if (rotateImage(crop->rotation, image, &crop->regionlist[i].width, 
                         &crop->regionlist[i].length, &crop_buff))
            {
-@@ -7655,8 +7793,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
+@@ -7647,8 +7785,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop,
          seg_buffs[i].size = (((crop->regionlist[i].width * image->bps + 7 ) / 8)
                                 * image->spp) * crop->regionlist[i].length; 
          }
@@ -604,6 +605,3 @@ index 77cf6ed1..791ec5e7 100644
    return (0);
    } /* end processCropSelections */
  
--- 
-2.33.0
-