modules/javafx.graphics/src/main/native-iio/libjpeg7/jdcoefct.c

*** 1,9 ****
--- 1,10 ----
  /*
   * jdcoefct.c
   *
   * Copyright (C) 1994-1997, Thomas G. Lane.
+  * Modified 2002-2011 by Guido Vollbeding.
   * This file is part of the Independent JPEG Group's software.
   * For conditions of distribution and use, see the accompanying README file.
   *
   * This file contains the coefficient buffer controller for decompression.
   * This controller is the top level of the JPEG decompressor proper.
*** 160,170 ****
    for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
         yoffset++) {
      for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
           MCU_col_num++) {
        /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
!       jzero_far((void FAR *) coef->MCU_buffer[0],
                  (size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
        if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
          /* Suspension forced; update state counters and exit */
          coef->MCU_vert_offset = yoffset;
          coef->MCU_ctr = MCU_col_num;
--- 161,172 ----
    for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
         yoffset++) {
      for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
           MCU_col_num++) {
        /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
!       if (cinfo->lim_Se)        /* can bypass in DC only case */
!         FMEMZERO((void FAR *) coef->MCU_buffer[0],
                   (size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
        if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
          /* Suspension forced; update state counters and exit */
          coef->MCU_vert_offset = yoffset;
          coef->MCU_ctr = MCU_col_num;
*** 727,736 ****
--- 729,741 ----
        (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                    D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
      for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {
        coef->MCU_buffer[i] = buffer + i;
      }
+     if (cinfo->lim_Se == 0)     /* DC only case: want to bypass later */
+       FMEMZERO((void FAR *) buffer,
+                (size_t) (D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK)));
      coef->pub.consume_data = dummy_consume_data;
      coef->pub.decompress_data = decompress_onepass;
      coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
    }
  }