diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
| commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
| tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /src/3rdparty/libjpeg/src/jdmaster.h | |
| parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
| parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdmaster.h')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jdmaster.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/src/jdmaster.h b/src/3rdparty/libjpeg/src/jdmaster.h new file mode 100644 index 0000000000..76897e2820 --- /dev/null +++ b/src/3rdparty/libjpeg/src/jdmaster.h @@ -0,0 +1,28 @@ +/* + * jdmaster.h + * + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1995, Thomas G. Lane. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * + * This file contains the master control structure for the JPEG decompressor. + */ + +/* Private state */ + +typedef struct { + struct jpeg_decomp_master pub; /* public fields */ + + int pass_number; /* # of passes completed */ + + boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */ + + /* Saved references to initialized quantizer modules, + * in case we need to switch modes. + */ + struct jpeg_color_quantizer *quantizer_1pass; + struct jpeg_color_quantizer *quantizer_2pass; +} my_decomp_master; + +typedef my_decomp_master *my_master_ptr; |