Fix issue with num_components not set

Calls to jpeg_simple_progression() should be made after num_components is set in a function such as jpeg_default_colorspace()
dengxiang · Mar 5, 2014 · 5523494 · 5523494
1 parent 3287e09
commit 5523494
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/jcparam.c b/jcparam.c
@@ -326,9 +326,7 @@ jpeg_set_defaults (j_compress_ptr cinfo)
 
 #ifdef C_PROGRESSIVE_SUPPORTED
   cinfo->optimize_scans = TRUE;
-  if (cinfo->use_moz_defaults)
-    jpeg_simple_progression(cinfo);
-  else {
+  if (!cinfo->use_moz_defaults) {
     /* Default is no multiple-scan output */
     cinfo->scan_info = NULL;
     cinfo->num_scans = 0;
@@ -401,6 +399,11 @@ jpeg_set_defaults (j_compress_ptr cinfo)
   /* Choose JPEG colorspace based on input space, set defaults accordingly */
 
   jpeg_default_colorspace(cinfo);
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+  if (cinfo->use_moz_defaults)
+    jpeg_simple_progression(cinfo);
+#endif
 }