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

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

Issue 7508009: Fix Windows build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 9 years, 4 months 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
« no previous file with comments | « no previous file | third_party/libjpeg_turbo/jmorecfg.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Index: jdmarker.c 1 Index: jdmarker.c
2 =================================================================== 2 ===================================================================
3 --- jdmarker.c (revision 677) 3 --- jdmarker.c (revision 677)
4 +++ jdmarker.c (working copy) 4 +++ jdmarker.c (working copy)
5 @@ -940,7 +940,144 @@ 5 @@ -940,7 +940,144 @@
6 return TRUE; 6 return TRUE;
7 } 7 }
8 8
9 +#ifdef MOTION_JPEG_SUPPORTED 9 +#ifdef MOTION_JPEG_SUPPORTED
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 * Read markers until SOS or EOI. 148 * Read markers until SOS or EOI.
149 * 149 *
150 @@ -1009,6 +1146,7 @@ 150 @@ -1009,6 +1146,7 @@
151 break; 151 break;
152 152
153 case M_SOS: 153 case M_SOS:
154 + mjpg_load_huff_tables(cinfo); 154 + mjpg_load_huff_tables(cinfo);
155 if (! get_sos(cinfo)) 155 if (! get_sos(cinfo))
156 return JPEG_SUSPENDED; 156 return JPEG_SUSPENDED;
157 cinfo->unread_marker = 0; /* processed the marker */ 157 cinfo->unread_marker = 0; /* processed the marker */
158 Index: jmorecfg.h
159 ===================================================================
160 --- jmorecfg.h (revision 677)
161 +++ jmorecfg.h (working copy)
162 @@ -153,14 +153,18 @@
163 /* INT16 must hold at least the values -32768..32767. */
164
165 #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */
166 +#ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
167 typedef short INT16;
168 #endif
169 +#endif
170
171 /* INT32 must hold at least signed 32-bit values. */
172
173 #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
174 +#ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
175 typedef long INT32;
176 #endif
177 +#endif
178
179 /* Datatype used for image dimensions. The JPEG standard only supports
180 * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
181 @@ -210,11 +214,13 @@
182 * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
183 */
184
185 +#ifndef FAR
186 #ifdef NEED_FAR_POINTERS
187 #define FAR far
188 #else
189 #define FAR
190 #endif
191 +#endif
192
193
194 /*
158 Index: jpeglib.h 195 Index: jpeglib.h
159 =================================================================== 196 ===================================================================
160 --- jpeglib.h (revision 677) 197 --- jpeglib.h (revision 677)
161 +++ jpeglib.h (working copy) 198 +++ jpeglib.h (working copy)
162 @@ -15,6 +15,10 @@ 199 @@ -15,6 +15,10 @@
163 #ifndef JPEGLIB_H 200 #ifndef JPEGLIB_H
164 #define JPEGLIB_H 201 #define JPEGLIB_H
165 202
166 +/* Begin chromium edits */ 203 +/* Begin chromium edits */
167 +#include "jpeglibmangler.h" 204 +#include "jpeglibmangler.h"
(...skipping 1686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 1891
1855 @@ -80,7 +80,7 @@ 1892 @@ -80,7 +80,7 @@
1856 %define WK_NUM 2 1893 %define WK_NUM 2
1857 1894
1858 align 16 1895 align 16
1859 - global EXTN(jsimd_fdct_ifast_mmx) 1896 - global EXTN(jsimd_fdct_ifast_mmx)
1860 + global EXTN(jsimd_fdct_ifast_mmx) PRIVATE 1897 + global EXTN(jsimd_fdct_ifast_mmx) PRIVATE
1861 1898
1862 EXTN(jsimd_fdct_ifast_mmx): 1899 EXTN(jsimd_fdct_ifast_mmx):
1863 push ebp 1900 push ebp
OLDNEW
« no previous file with comments | « no previous file | third_party/libjpeg_turbo/jmorecfg.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698