| Index: third_party/libjpeg_turbo/jpegint.h
 | 
| ===================================================================
 | 
| --- third_party/libjpeg_turbo/jpegint.h	(revision 95020)
 | 
| +++ third_party/libjpeg_turbo/jpegint.h	(working copy)
 | 
| @@ -2,6 +2,7 @@
 | 
|   * jpegint.h
 | 
|   *
 | 
|   * 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.
 | 
|   *
 | 
| @@ -304,6 +305,7 @@
 | 
|  #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
 | 
|  #define jinit_d_main_controller	jIDMainC
 | 
| @@ -313,6 +315,7 @@
 | 
|  #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
 | 
|  #define jinit_color_deconverter	jIDColor
 | 
| @@ -327,6 +330,7 @@
 | 
|  #define jzero_far		jZeroFar
 | 
|  #define jpeg_zigzag_order	jZIGTable
 | 
|  #define jpeg_natural_order	jZAGTable
 | 
| +#define jpeg_aritab		jAriTab
 | 
|  #endif /* NEED_SHORT_EXTERNAL_NAMES */
 | 
|  
 | 
|  
 | 
| @@ -345,6 +349,7 @@
 | 
|  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 */
 | 
|  EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
 | 
| @@ -358,6 +363,7 @@
 | 
|  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));
 | 
|  EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
 | 
| @@ -369,7 +375,7 @@
 | 
|  
 | 
|  /* Utility routines in jutils.c */
 | 
|  EXTERN(long) jdiv_round_up JPP((long a, long b));
 | 
| -EXTERN(size_t) jround_up JPP((size_t a, size_t b));
 | 
| +EXTERN(long) jround_up JPP((long a, long b));
 | 
|  EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
 | 
|  				    JSAMPARRAY output_array, int dest_row,
 | 
|  				    int num_rows, JDIMENSION num_cols));
 | 
| @@ -382,6 +388,9 @@
 | 
|  #endif
 | 
|  extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
 | 
|  
 | 
| +/* Arithmetic coding probability estimation tables in jaricom.c */
 | 
| +extern const INT32 jpeg_aritab[];
 | 
| +
 | 
|  /* Suppress undefined-structure complaints if necessary. */
 | 
|  
 | 
|  #ifdef INCOMPLETE_TYPES_BROKEN
 | 
| 
 |