kc3-lang/libjpeg-turbo/jdmrg565.c

• Show log

  Commit

• Hash : 9120a247
  Author :
  Date : 2020-07-23T21:24:38
  

  Fix jpeg_skip_scanlines() segfault w/merged upsamp
  
  The additional segfault mentioned in #244 was due to the fact that
  the merged upsamplers use a different private structure than the
  non-merged upsamplers.  jpeg_skip_scanlines() was assuming the latter, so
  when merged upsampling was enabled, jpeg_skip_scanlines() clobbered one
  of the IDCT method pointers in the merged upsampler's private structure.
  
  For reasons unknown, the test image in #441 did not encounter this
  segfault (too small?), but it encountered an issue similar to the one
  fixed in 5bc43c7821df982f65aa1c738f67fbf7cba8bd69, whereby it was
  necessary to set up a dummy postprocessing function in
  read_and_discard_scanlines() when merged upsampling was enabled.
  Failing to do so caused either a segfault in merged_2v_upsample() (due
  to a NULL pointer being passed to jcopy_sample_rows()) or an error
  ("Corrupt JPEG data: premature end of data segment"), depending on the
  number of scanlines skipped and whether the first scanline skipped was
  an odd- or even-numbered row.
  
  Fixes #441
  Fixes #244 (for real this time)
  

Download

• jdmrg565.c

• /*
   * jdmrg565.c
   *
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1994-1996, Thomas G. Lane.
   * libjpeg-turbo Modifications:
   * Copyright (C) 2013, Linaro Limited.
   * Copyright (C) 2014-2015, 2018, 2020, D. R. Commander.
   * For conditions of distribution and use, see the accompanying README.ijg
   * file.
   *
   * This file contains code for merged upsampling/color conversion.
   */
  
  
  INLINE
  LOCAL(void)
  h2v1_merged_upsample_565_internal(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
                                    JDIMENSION in_row_group_ctr,
                                    JSAMPARRAY output_buf)
  {
    my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    register int y, cred, cgreen, cblue;
    int cb, cr;
    register JSAMPROW outptr;
    JSAMPROW inptr0, inptr1, inptr2;
    JDIMENSION col;
    /* copy these pointers into registers if possible */
    register JSAMPLE *range_limit = cinfo->sample_range_limit;
    int *Crrtab = upsample->Cr_r_tab;
    int *Cbbtab = upsample->Cb_b_tab;
    JLONG *Crgtab = upsample->Cr_g_tab;
    JLONG *Cbgtab = upsample->Cb_g_tab;
    unsigned int r, g, b;
    JLONG rgb;
    SHIFT_TEMPS
  
    inptr0 = input_buf[0][in_row_group_ctr];
    inptr1 = input_buf[1][in_row_group_ctr];
    inptr2 = input_buf[2][in_row_group_ctr];
    outptr = output_buf[0];
  
    /* Loop for each pair of output pixels */
    for (col = cinfo->output_width >> 1; col > 0; col--) {
      /* Do the chroma part of the calculation */
      cb = GETJSAMPLE(*inptr1++);
      cr = GETJSAMPLE(*inptr2++);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      /* Fetch 2 Y values and emit 2 pixels */
      y  = GETJSAMPLE(*inptr0++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr0++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr, rgb);
      outptr += 4;
    }
  
    /* If image width is odd, do the last output column separately */
    if (cinfo->output_width & 1) {
      cb = GETJSAMPLE(*inptr1);
      cr = GETJSAMPLE(*inptr2);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
      y  = GETJSAMPLE(*inptr0);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr = (INT16)rgb;
    }
  }
  
  
  INLINE
  LOCAL(void)
  h2v1_merged_upsample_565D_internal(j_decompress_ptr cinfo,
                                     JSAMPIMAGE input_buf,
                                     JDIMENSION in_row_group_ctr,
                                     JSAMPARRAY output_buf)
  {
    my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    register int y, cred, cgreen, cblue;
    int cb, cr;
    register JSAMPROW outptr;
    JSAMPROW inptr0, inptr1, inptr2;
    JDIMENSION col;
    /* copy these pointers into registers if possible */
    register JSAMPLE *range_limit = cinfo->sample_range_limit;
    int *Crrtab = upsample->Cr_r_tab;
    int *Cbbtab = upsample->Cb_b_tab;
    JLONG *Crgtab = upsample->Cr_g_tab;
    JLONG *Cbgtab = upsample->Cb_g_tab;
    JLONG d0 = dither_matrix[cinfo->output_scanline & DITHER_MASK];
    unsigned int r, g, b;
    JLONG rgb;
    SHIFT_TEMPS
  
    inptr0 = input_buf[0][in_row_group_ctr];
    inptr1 = input_buf[1][in_row_group_ctr];
    inptr2 = input_buf[2][in_row_group_ctr];
    outptr = output_buf[0];
  
    /* Loop for each pair of output pixels */
    for (col = cinfo->output_width >> 1; col > 0; col--) {
      /* Do the chroma part of the calculation */
      cb = GETJSAMPLE(*inptr1++);
      cr = GETJSAMPLE(*inptr2++);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      /* Fetch 2 Y values and emit 2 pixels */
      y  = GETJSAMPLE(*inptr0++);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      d0 = DITHER_ROTATE(d0);
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr0++);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      d0 = DITHER_ROTATE(d0);
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr, rgb);
      outptr += 4;
    }
  
    /* If image width is odd, do the last output column separately */
    if (cinfo->output_width & 1) {
      cb = GETJSAMPLE(*inptr1);
      cr = GETJSAMPLE(*inptr2);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
      y  = GETJSAMPLE(*inptr0);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr = (INT16)rgb;
    }
  }
  
  
  INLINE
  LOCAL(void)
  h2v2_merged_upsample_565_internal(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
                                    JDIMENSION in_row_group_ctr,
                                    JSAMPARRAY output_buf)
  {
    my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    register int y, cred, cgreen, cblue;
    int cb, cr;
    register JSAMPROW outptr0, outptr1;
    JSAMPROW inptr00, inptr01, inptr1, inptr2;
    JDIMENSION col;
    /* copy these pointers into registers if possible */
    register JSAMPLE *range_limit = cinfo->sample_range_limit;
    int *Crrtab = upsample->Cr_r_tab;
    int *Cbbtab = upsample->Cb_b_tab;
    JLONG *Crgtab = upsample->Cr_g_tab;
    JLONG *Cbgtab = upsample->Cb_g_tab;
    unsigned int r, g, b;
    JLONG rgb;
    SHIFT_TEMPS
  
    inptr00 = input_buf[0][in_row_group_ctr * 2];
    inptr01 = input_buf[0][in_row_group_ctr * 2 + 1];
    inptr1 = input_buf[1][in_row_group_ctr];
    inptr2 = input_buf[2][in_row_group_ctr];
    outptr0 = output_buf[0];
    outptr1 = output_buf[1];
  
    /* Loop for each group of output pixels */
    for (col = cinfo->output_width >> 1; col > 0; col--) {
      /* Do the chroma part of the calculation */
      cb = GETJSAMPLE(*inptr1++);
      cr = GETJSAMPLE(*inptr2++);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      /* Fetch 4 Y values and emit 4 pixels */
      y  = GETJSAMPLE(*inptr00++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr00++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr0, rgb);
      outptr0 += 4;
  
      y  = GETJSAMPLE(*inptr01++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr01++);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr1, rgb);
      outptr1 += 4;
    }
  
    /* If image width is odd, do the last output column separately */
    if (cinfo->output_width & 1) {
      cb = GETJSAMPLE(*inptr1);
      cr = GETJSAMPLE(*inptr2);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      y  = GETJSAMPLE(*inptr00);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr0 = (INT16)rgb;
  
      y  = GETJSAMPLE(*inptr01);
      r = range_limit[y + cred];
      g = range_limit[y + cgreen];
      b = range_limit[y + cblue];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr1 = (INT16)rgb;
    }
  }
  
  
  INLINE
  LOCAL(void)
  h2v2_merged_upsample_565D_internal(j_decompress_ptr cinfo,
                                     JSAMPIMAGE input_buf,
                                     JDIMENSION in_row_group_ctr,
                                     JSAMPARRAY output_buf)
  {
    my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    register int y, cred, cgreen, cblue;
    int cb, cr;
    register JSAMPROW outptr0, outptr1;
    JSAMPROW inptr00, inptr01, inptr1, inptr2;
    JDIMENSION col;
    /* copy these pointers into registers if possible */
    register JSAMPLE *range_limit = cinfo->sample_range_limit;
    int *Crrtab = upsample->Cr_r_tab;
    int *Cbbtab = upsample->Cb_b_tab;
    JLONG *Crgtab = upsample->Cr_g_tab;
    JLONG *Cbgtab = upsample->Cb_g_tab;
    JLONG d0 = dither_matrix[cinfo->output_scanline & DITHER_MASK];
    JLONG d1 = dither_matrix[(cinfo->output_scanline + 1) & DITHER_MASK];
    unsigned int r, g, b;
    JLONG rgb;
    SHIFT_TEMPS
  
    inptr00 = input_buf[0][in_row_group_ctr * 2];
    inptr01 = input_buf[0][in_row_group_ctr * 2 + 1];
    inptr1 = input_buf[1][in_row_group_ctr];
    inptr2 = input_buf[2][in_row_group_ctr];
    outptr0 = output_buf[0];
    outptr1 = output_buf[1];
  
    /* Loop for each group of output pixels */
    for (col = cinfo->output_width >> 1; col > 0; col--) {
      /* Do the chroma part of the calculation */
      cb = GETJSAMPLE(*inptr1++);
      cr = GETJSAMPLE(*inptr2++);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      /* Fetch 4 Y values and emit 4 pixels */
      y  = GETJSAMPLE(*inptr00++);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      d0 = DITHER_ROTATE(d0);
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr00++);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      d0 = DITHER_ROTATE(d0);
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr0, rgb);
      outptr0 += 4;
  
      y  = GETJSAMPLE(*inptr01++);
      r = range_limit[DITHER_565_R(y + cred, d1)];
      g = range_limit[DITHER_565_G(y + cgreen, d1)];
      b = range_limit[DITHER_565_B(y + cblue, d1)];
      d1 = DITHER_ROTATE(d1);
      rgb = PACK_SHORT_565(r, g, b);
  
      y  = GETJSAMPLE(*inptr01++);
      r = range_limit[DITHER_565_R(y + cred, d1)];
      g = range_limit[DITHER_565_G(y + cgreen, d1)];
      b = range_limit[DITHER_565_B(y + cblue, d1)];
      d1 = DITHER_ROTATE(d1);
      rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
  
      WRITE_TWO_PIXELS(outptr1, rgb);
      outptr1 += 4;
    }
  
    /* If image width is odd, do the last output column separately */
    if (cinfo->output_width & 1) {
      cb = GETJSAMPLE(*inptr1);
      cr = GETJSAMPLE(*inptr2);
      cred = Crrtab[cr];
      cgreen = (int)RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
      cblue = Cbbtab[cb];
  
      y  = GETJSAMPLE(*inptr00);
      r = range_limit[DITHER_565_R(y + cred, d0)];
      g = range_limit[DITHER_565_G(y + cgreen, d0)];
      b = range_limit[DITHER_565_B(y + cblue, d0)];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr0 = (INT16)rgb;
  
      y  = GETJSAMPLE(*inptr01);
      r = range_limit[DITHER_565_R(y + cred, d1)];
      g = range_limit[DITHER_565_G(y + cgreen, d1)];
      b = range_limit[DITHER_565_B(y + cblue, d1)];
      rgb = PACK_SHORT_565(r, g, b);
      *(INT16 *)outptr1 = (INT16)rgb;
    }
  }
  

Download