summaryrefslogtreecommitdiff
path: root/jpeg/jcapimin.c
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2011-02-15 15:25:53 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2011-02-15 15:25:53 +0000
commit1216e9530fe541df6b95ffa39d00df9919cee4fa (patch)
tree38f5fb51bbbd369dcd9ad33f2a7cada19ae85eff /jpeg/jcapimin.c
parent5d1669e2730d21e3f48739002619b3605c32ed23 (diff)
Update JPEG library to v8b.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8425 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'jpeg/jcapimin.c')
-rw-r--r--jpeg/jcapimin.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/jpeg/jcapimin.c b/jpeg/jcapimin.c
index 54fb8c58c..639ce86f4 100644
--- a/jpeg/jcapimin.c
+++ b/jpeg/jcapimin.c
@@ -2,6 +2,7 @@
* jcapimin.c
*
* Copyright (C) 1994-1998, Thomas G. Lane.
+ * Modified 2003-2010 by Guido Vollbeding.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -63,14 +64,21 @@ jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
cinfo->comp_info = NULL;
- for (i = 0; i < NUM_QUANT_TBLS; i++)
+ for (i = 0; i < NUM_QUANT_TBLS; i++) {
cinfo->quant_tbl_ptrs[i] = NULL;
+ cinfo->q_scale_factor[i] = 100;
+ }
for (i = 0; i < NUM_HUFF_TBLS; i++) {
cinfo->dc_huff_tbl_ptrs[i] = NULL;
cinfo->ac_huff_tbl_ptrs[i] = NULL;
}
+ /* Must do it here for emit_dqt in case jpeg_write_tables is used */
+ cinfo->block_size = DCTSIZE;
+ cinfo->natural_order = jpeg_natural_order;
+ cinfo->lim_Se = DCTSIZE2-1;
+
cinfo->script_space = NULL;
cinfo->input_gamma = 1.0; /* in case application forgets */