Changeset 846 for trunk/src/3rdparty/libjpeg/jpegint.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libjpeg/jpegint.h (modified) (9 diffs)

trunk/src/3rdparty/libjpeg/jpegint.h

@@ -3 +3 @@
  *
  * Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modified 1997-2009 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.
@@ -100 +101 @@
 
 /* Forward DCT (also controls coefficient quantization) */
+typedef JMETHOD(void, forward_DCT_ptr,
+                (j_compress_ptr cinfo, jpeg_component_info * compptr,
+                 JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+                 JDIMENSION start_row, JDIMENSION start_col,
+                 JDIMENSION num_blocks));
+
 struct jpeg_forward_dct {
   JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-                              jpeg_component_info * compptr,
-                              JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-                              JDIMENSION start_row, JDIMENSION start_col,
-                              JDIMENSION num_blocks));
+  /* It is useful to allow each component to have a separate FDCT method. */
+  forward_DCT_ptr forward_DCT[MAX_COMPONENTS];
 };
 
@@ -211 +214 @@
   JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
                                 JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  boolean insufficient_data;    /* set TRUE after emitting warning */
 };
 
@@ -304 +303 @@
 #define jinit_forward_dct       jIFDCT
 #define jinit_huff_encoder      jIHEncoder
-#define jinit_phuff_encoder     jIPHEncoder
+#define jinit_arith_encoder     jIAEncoder
 #define jinit_marker_writer     jIMWriter
 #define jinit_master_decompress jIDMaster
@@ -313 +312 @@
 #define jinit_marker_reader     jIMReader
 #define jinit_huff_decoder      jIHDecoder
-#define jinit_phuff_decoder     jIPHDecoder
+#define jinit_arith_decoder     jIADecoder
 #define jinit_inverse_dct       jIIDCT
 #define jinit_upsampler         jIUpsampler
@@ -328 +327 @@
 #define jpeg_zigzag_order       jZIGTable
 #define jpeg_natural_order      jZAGTable
+#define jpeg_natural_order7     jZAGTable7
+#define jpeg_natural_order6     jZAGTable6
+#define jpeg_natural_order5     jZAGTable5
+#define jpeg_natural_order4     jZAGTable4
+#define jpeg_natural_order3     jZAGTable3
+#define jpeg_natural_order2     jZAGTable2
+#define jpeg_aritab             jAriTab
 #endif /* NEED_SHORT_EXTERNAL_NAMES */
 
@@ -345 +351 @@
 EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
 EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));
 EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
 /* Decompression module initialization routines */
@@ -358 +364 @@
 EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
@@ -382 +388 @@
 #endif
 extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
+extern const int jpeg_natural_order7[]; /* zz to natural order for 7x7 block */
+extern const int jpeg_natural_order6[]; /* zz to natural order for 6x6 block */
+extern const int jpeg_natural_order5[]; /* zz to natural order for 5x5 block */
+extern const int jpeg_natural_order4[]; /* zz to natural order for 4x4 block */
+extern const int jpeg_natural_order3[]; /* zz to natural order for 3x3 block */
+extern const int jpeg_natural_order2[]; /* zz to natural order for 2x2 block */
+
+/* Arithmetic coding probability estimation tables in jaricom.c */
+extern const INT32 jpeg_aritab[];
 
 /* Suppress undefined-structure complaints if necessary. */