Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Side by Side Diff: third_party/libjpeg_turbo/google.patch

Issue 4298001: Add build files for libjpeg-turbo.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
(Empty)
1 Index: jmorecfg.h
2 ===================================================================
3 --- jmorecfg.h (revision 64575)
4 +++ jmorecfg.h (working copy)
5 @@ -159,8 +159,10 @@
6 /* INT32 must hold at least signed 32-bit values. */
7
8 #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
9 +#ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
10 typedef long INT32;
11 #endif
12 +#endif
13
14 /* Datatype used for image dimensions. The JPEG standard only supports
15 * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
16 @@ -210,11 +212,13 @@
17 * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
18 */
19
20 +#ifndef FAR
21 #ifdef NEED_FAR_POINTERS
22 #define FAR far
23 #else
24 #define FAR
25 #endif
26 +#endif
27
28
29 /*
30 Index: jpeglib.h
31 ===================================================================
32 --- jpeglib.h (revision 64575)
33 +++ jpeglib.h (working copy)
34 @@ -18,6 +18,10 @@
35 extern "C" {
36 #endif
37
38 +/* Begin chromium edits */
39 +#include "jpeglibmangler.h"
40 +/* End chromium edits */
41 +
42 /*
43 * First we include the configuration files that record how this
44 * installation of the JPEG library is set up. jconfig.h can be
45 Index: jpeglibmangler.h
46 ===================================================================
47 --- jpeglibmangler.h (revision 0)
48 +++ jpeglibmangler.h (revision 0)
49 @@ -0,0 +1,113 @@
50 +// Copyright (c) 2009 The Chromium Authors. All rights reserved.
51 +// Use of this source code is governed by a BSD-style license that can be
52 +// found in the LICENSE file.
53 +
54 +#ifndef THIRD_PARTY_LIBJPEG_TURBO_JPEGLIBMANGLER_H_
55 +#define THIRD_PARTY_LIBJPEG_TURBO_JPEGLIBMANGLER_H_
56 +
57 +// Mangle all externally visible function names so we can build our own libjpeg
58 +// without system libraries trying to use it.
59 +
60 +#define jpeg_make_c_derived_tbl chromium_jpeg_make_c_derived_tbl
61 +#define jpeg_gen_optimal_table chromium_jpeg_gen_optimal_table
62 +#define jpeg_make_d_derived_tbl chromium_jpeg_make_d_derived_tbl
63 +#define jpeg_fill_bit_buffer chromium_jpeg_fill_bit_buffer
64 +#define jpeg_huff_decode chromium_jpeg_huff_decode
65 +#define jpeg_fdct_islow chromium_jpeg_fdct_islow
66 +#define jpeg_fdct_ifast chromium_jpeg_fdct_ifast
67 +#define jpeg_fdct_float chromium_jpeg_fdct_float
68 +#define jpeg_idct_islow chromium_jpeg_idct_islow
69 +#define jpeg_idct_ifast chromium_jpeg_idct_ifast
70 +#define jpeg_idct_float chromium_jpeg_idct_float
71 +#define jpeg_idct_4x4 chromium_jpeg_idct_4x4
72 +#define jpeg_idct_2x2 chromium_jpeg_idct_2x2
73 +#define jpeg_idct_1x1 chromium_jpeg_idct_1x1
74 +#define jinit_compress_master chromium_jinit_compress_master
75 +#define jinit_c_master_control chromium_jinit_c_master_control
76 +#define jinit_c_main_controller chromium_jinit_c_main_controller
77 +#define jinit_c_prep_controller chromium_jinit_c_prep_controller
78 +#define jinit_c_coef_controller chromium_jinit_c_coef_controller
79 +#define jinit_color_converter chromium_jinit_color_converter
80 +#define jinit_downsampler chromium_jinit_downsampler
81 +#define jinit_forward_dct chromium_jinit_forward_dct
82 +#define jinit_huff_encoder chromium_jinit_huff_encoder
83 +#define jinit_phuff_encoder chromium_jinit_phuff_encoder
84 +#define jinit_marker_writer chromium_jinit_marker_writer
85 +#define jinit_master_decompress chromium_jinit_master_decompress
86 +#define jinit_d_main_controller chromium_jinit_d_main_controller
87 +#define jinit_d_coef_controller chromium_jinit_d_coef_controller
88 +#define jinit_d_post_controller chromium_jinit_d_post_controller
89 +#define jinit_input_controller chromium_jinit_input_controller
90 +#define jinit_marker_reader chromium_jinit_marker_reader
91 +#define jinit_huff_decoder chromium_jinit_huff_decoder
92 +#define jinit_phuff_decoder chromium_jinit_phuff_decoder
93 +#define jinit_inverse_dct chromium_jinit_inverse_dct
94 +#define jinit_upsampler chromium_jinit_upsampler
95 +#define jinit_color_deconverter chromium_jinit_color_deconverter
96 +#define jinit_1pass_quantizer chromium_jinit_1pass_quantizer
97 +#define jinit_2pass_quantizer chromium_jinit_2pass_quantizer
98 +#define jinit_merged_upsampler chromium_jinit_merged_upsampler
99 +#define jinit_memory_mgr chromium_jinit_memory_mgr
100 +#define jdiv_round_up chromium_jdiv_round_up
101 +#define jround_up chromium_jround_up
102 +#define jcopy_sample_rows chromium_jcopy_sample_rows
103 +#define jcopy_block_row chromium_jcopy_block_row
104 +#define jzero_far chromium_jzero_far
105 +#define jpeg_std_error chromium_jpeg_std_error
106 +#define jpeg_CreateCompress chromium_jpeg_CreateCompress
107 +#define jpeg_CreateDecompress chromium_jpeg_CreateDecompress
108 +#define jpeg_destroy_compress chromium_jpeg_destroy_compress
109 +#define jpeg_destroy_decompress chromium_jpeg_destroy_decompress
110 +#define jpeg_stdio_dest chromium_jpeg_stdio_dest
111 +#define jpeg_stdio_src chromium_jpeg_stdio_src
112 +#define jpeg_set_defaults chromium_jpeg_set_defaults
113 +#define jpeg_set_colorspace chromium_jpeg_set_colorspace
114 +#define jpeg_default_colorspace chromium_jpeg_default_colorspace
115 +#define jpeg_set_quality chromium_jpeg_set_quality
116 +#define jpeg_set_linear_quality chromium_jpeg_set_linear_quality
117 +#define jpeg_add_quant_table chromium_jpeg_add_quant_table
118 +#define jpeg_quality_scaling chromium_jpeg_quality_scaling
119 +#define jpeg_simple_progression chromium_jpeg_simple_progression
120 +#define jpeg_suppress_tables chromium_jpeg_suppress_tables
121 +#define jpeg_alloc_quant_table chromium_jpeg_alloc_quant_table
122 +#define jpeg_alloc_huff_table chromium_jpeg_alloc_huff_table
123 +#define jpeg_start_compress chromium_jpeg_start_compress
124 +#define jpeg_write_scanlines chromium_jpeg_write_scanlines
125 +#define jpeg_finish_compress chromium_jpeg_finish_compress
126 +#define jpeg_write_raw_data chromium_jpeg_write_raw_data
127 +#define jpeg_write_marker chromium_jpeg_write_marker
128 +#define jpeg_write_m_header chromium_jpeg_write_m_header
129 +#define jpeg_write_m_byte chromium_jpeg_write_m_byte
130 +#define jpeg_write_tables chromium_jpeg_write_tables
131 +#define jpeg_read_header chromium_jpeg_read_header
132 +#define jpeg_start_decompress chromium_jpeg_start_decompress
133 +#define jpeg_read_scanlines chromium_jpeg_read_scanlines
134 +#define jpeg_finish_decompress chromium_jpeg_finish_decompress
135 +#define jpeg_read_raw_data chromium_jpeg_read_raw_data
136 +#define jpeg_has_multiple_scans chromium_jpeg_has_multiple_scans
137 +#define jpeg_start_output chromium_jpeg_start_output
138 +#define jpeg_finish_output chromium_jpeg_finish_output
139 +#define jpeg_input_complete chromium_jpeg_input_complete
140 +#define jpeg_new_colormap chromium_jpeg_new_colormap
141 +#define jpeg_consume_input chromium_jpeg_consume_input
142 +#define jpeg_calc_output_dimensions chromium_jpeg_calc_output_dimensions
143 +#define jpeg_save_markers chromium_jpeg_save_markers
144 +#define jpeg_set_marker_processor chromium_jpeg_set_marker_processor
145 +#define jpeg_read_coefficients chromium_jpeg_read_coefficients
146 +#define jpeg_write_coefficients chromium_jpeg_write_coefficients
147 +#define jpeg_copy_critical_parameters chromium_jpeg_copy_critical_parameters
148 +#define jpeg_abort_compress chromium_jpeg_abort_compress
149 +#define jpeg_abort_decompress chromium_jpeg_abort_decompress
150 +#define jpeg_abort chromium_jpeg_abort
151 +#define jpeg_destroy chromium_jpeg_destroy
152 +#define jpeg_resync_to_restart chromium_jpeg_resync_to_restart
153 +#define jpeg_get_small chromium_jpeg_get_small
154 +#define jpeg_free_small chromium_jpeg_free_small
155 +#define jpeg_get_large chromium_jpeg_get_large
156 +#define jpeg_free_large chromium_jpeg_free_large
157 +#define jpeg_mem_available chromium_jpeg_mem_available
158 +#define jpeg_open_backing_store chromium_jpeg_open_backing_store
159 +#define jpeg_mem_init chromium_jpeg_mem_init
160 +#define jpeg_mem_term chromium_jpeg_mem_term
161 +
162 +#endif // THIRD_PARTY_LIBJPEG_TURBO_JPEGLIBMANGLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698