Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjpeg_turbo / jcmaster.c

diff --git a/src/third_party/libjpeg_turbo/jcmaster.c b/src/third_party/libjpeg_turbo/jcmaster.c
index 3ca346c..dca0315 100644 (file)
--- a/src/third_party/libjpeg_turbo/jcmaster.c
+++ b/src/third_party/libjpeg_turbo/jcmaster.c
@@ -1,10 +1,11 @@
 /*
  * jcmaster.c
  *
+ * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1997, Thomas G. Lane.
  * Modified 2003-2010 by Guido Vollbeding.
+ * libjpeg-turbo Modifications:
  * Copyright (C) 2010, D. R. Commander.
- * 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 master control logic for the JPEG compressor.
@@ -601,7 +602,7 @@ jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
     cinfo->num_scans = 1;
   }
 
-  if (cinfo->progressive_mode) /*  TEMPORARY HACK ??? */
+  if (cinfo->progressive_mode && !cinfo->arith_code)   /*  TEMPORARY HACK ??? */
     cinfo->optimize_coding = TRUE; /* assume default tables no good for progressive mode */
 
   /* Initialize my private state */