src/java.desktop/share/native/libjavajpeg/imageioJPEG.c

*** 950,960 ****
                                  input,
                                  JPEGImageReader_readInputDataID,
                                  sb->hstreamBuffer, 0,
                                  sb->bufferLength);
      if ((ret > 0) && ((unsigned int)ret > sb->bufferLength)) {
!          ret = sb->bufferLength;
      }
      if ((*env)->ExceptionOccurred(env)
          || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
              cinfo->err->error_exit((j_common_ptr) cinfo);
      }
--- 950,960 ----
                                  input,
                                  JPEGImageReader_readInputDataID,
                                  sb->hstreamBuffer, 0,
                                  sb->bufferLength);
      if ((ret > 0) && ((unsigned int)ret > sb->bufferLength)) {
!          ret = (int)sb->bufferLength;
      }
      if ((*env)->ExceptionOccurred(env)
          || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
              cinfo->err->error_exit((j_common_ptr) cinfo);
      }
*** 1048,1058 ****
  
      ret = (*env)->CallIntMethod(env, input,
                                  JPEGImageReader_readInputDataID,
                                  sb->hstreamBuffer,
                                  offset, buflen);
!     if ((ret > 0) && ((unsigned int)ret > buflen)) ret = buflen;
      if ((*env)->ExceptionOccurred(env)
          || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
          cinfo->err->error_exit((j_common_ptr) cinfo);
      }
      /*
--- 1048,1058 ----
  
      ret = (*env)->CallIntMethod(env, input,
                                  JPEGImageReader_readInputDataID,
                                  sb->hstreamBuffer,
                                  offset, buflen);
!     if ((ret > 0) && ((unsigned int)ret > buflen)) ret = (int)buflen;
      if ((*env)->ExceptionOccurred(env)
          || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
          cinfo->err->error_exit((j_common_ptr) cinfo);
      }
      /*
*** 1772,1783 ****
  
              v_samp0 = cinfo->comp_info[0].v_samp_factor;
              v_samp1 = cinfo->comp_info[1].v_samp_factor;
              v_samp2 = cinfo->comp_info[2].v_samp_factor;
  
!             if ((h_samp1 > h_samp0) && (h_samp2 > h_samp0) ||
!                 (v_samp1 > v_samp0) && (v_samp2 > v_samp0))
              {
                  cinfo->jpeg_color_space = JCS_YCCK;
                  /* Leave the output space as CMYK */
              }
          }
--- 1772,1783 ----
  
              v_samp0 = cinfo->comp_info[0].v_samp_factor;
              v_samp1 = cinfo->comp_info[1].v_samp_factor;
              v_samp2 = cinfo->comp_info[2].v_samp_factor;
  
!             if (((h_samp1 > h_samp0) && (h_samp2 > h_samp0)) ||
!                 ((v_samp1 > v_samp0) && (v_samp2 > v_samp0)))
              {
                  cinfo->jpeg_color_space = JCS_YCCK;
                  /* Leave the output space as CMYK */
              }
          }
*** 1864,1874 ****
      int targetLine;
      int skipLines, linesLeft;
      pixelBufferPtr pb;
      sun_jpeg_error_ptr jerr;
      boolean done;
-     boolean mustScale = FALSE;
      boolean progressive = FALSE;
      boolean orderedBands = TRUE;
      imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
      j_decompress_ptr cinfo;
      size_t numBytes;
--- 1864,1873 ----