diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-11 11:18:28 (GMT) |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-11 11:18:28 (GMT) |
| commit | aa5be2cf2d0019a34855345e2497faa5c85c9fc7 (patch) | |
| tree | 9563ec9688d9f00094797b15feef3daa3a9fefc4 /src/3rdparty/libjpeg/jcapimin.c | |
| parent | 32ae0efae56a7b17880955561462363e6b432f65 (diff) | |
| parent | ce472d082a992547fdd51eb3eda2ee07d06802b6 (diff) | |
| download | Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.zip Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.tar.gz Qt-aa5be2cf2d0019a34855345e2497faa5c85c9fc7.tar.bz2 | |
Merge remote-tracking branch 'qt-releng-team/master'
Diffstat (limited to 'src/3rdparty/libjpeg/jcapimin.c')
| -rw-r--r-- | src/3rdparty/libjpeg/jcapimin.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/jcapimin.c b/src/3rdparty/libjpeg/jcapimin.c index 563ab42..639ce86 100644 --- a/src/3rdparty/libjpeg/jcapimin.c +++ b/src/3rdparty/libjpeg/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. * @@ -73,6 +74,11 @@ jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize) 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 */ |