Merge branch '1.4.x'

2015-09-21 13:13:44 -05:00
parent 870b4f28b4 8e9cef2e6f
commit 60efb896e0
9 changed files with 121 additions and 90 deletions
--- a/jdarith.c
+++ b/jdarith.c
@@ -306,7 +306,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
    }

    /* Scale and output the DC coefficient (assumes jpeg_natural_order[0]=0) */
-    (*block)[0] = (JCOEF) (entropy->last_dc_val[ci] << cinfo->Al);
+    (*block)[0] = (JCOEF) LEFT_SHIFT(entropy->last_dc_val[ci], cinfo->Al);
  }

  return TRUE;