1.1 --- a/src/share/native/sun/awt/image/jpeg/jdmarker.c Thu Jul 02 12:02:08 2020 -0700
1.2 +++ b/src/share/native/sun/awt/image/jpeg/jdmarker.c Fri Sep 11 16:12:45 2020 +0000
1.3 @@ -238,7 +238,7 @@
1.4
1.5
1.6 LOCAL(boolean)
1.7 -get_sof (j_decompress_ptr cinfo, boolean is_baseline, boolean is_prog, boolean is_arith)
1.8 +get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith)
1.9 /* Process a SOFn marker */
1.10 {
1.11 INT32 length;
1.12 @@ -246,7 +246,6 @@
1.13 jpeg_component_info * compptr;
1.14 INPUT_VARS(cinfo);
1.15
1.16 - cinfo->is_baseline = is_baseline;
1.17 cinfo->progressive_mode = is_prog;
1.18 cinfo->arith_code = is_arith;
1.19
1.20 @@ -999,27 +998,23 @@
1.21 break;
1.22
1.23 case M_SOF0: /* Baseline */
1.24 - if (! get_sof(cinfo, TRUE, FALSE, FALSE))
1.25 - return JPEG_SUSPENDED;
1.26 - break;
1.27 -
1.28 case M_SOF1: /* Extended sequential, Huffman */
1.29 - if (! get_sof(cinfo, FALSE, FALSE, FALSE))
1.30 + if (! get_sof(cinfo, FALSE, FALSE))
1.31 return JPEG_SUSPENDED;
1.32 break;
1.33
1.34 case M_SOF2: /* Progressive, Huffman */
1.35 - if (! get_sof(cinfo, FALSE, TRUE, FALSE))
1.36 + if (! get_sof(cinfo, TRUE, FALSE))
1.37 return JPEG_SUSPENDED;
1.38 break;
1.39
1.40 case M_SOF9: /* Extended sequential, arithmetic */
1.41 - if (! get_sof(cinfo, FALSE, FALSE, TRUE))
1.42 + if (! get_sof(cinfo, FALSE, TRUE))
1.43 return JPEG_SUSPENDED;
1.44 break;
1.45
1.46 case M_SOF10: /* Progressive, arithmetic */
1.47 - if (! get_sof(cinfo, FALSE, TRUE, TRUE))
1.48 + if (! get_sof(cinfo, TRUE, TRUE))
1.49 return JPEG_SUSPENDED;
1.50 break;
1.51
