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

Side by Side Diff: third_party/libtiff/0000-build-config.patch

Issue 1572523002: XFA: Remove relative includes outside of xfa/. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 4 years, 11 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
OLDNEW
1 diff a/third_party/libtiff/tiffiop.h b/third_party/libtiff/tiffiop.h 1 diff a/third_party/libtiff/tiffiop.h b/third_party/libtiff/tiffiop.h
2 --- a/third_party/libtiff/tiffiop.h 2 --- a/third_party/libtiff/tiffiop.h
3 +++ b/third_party/libtiff/tiffiop.h 3 +++ b/third_party/libtiff/tiffiop.h
4 @@ -30,7 +30,7 @@ 4 @@ -30,7 +30,7 @@
5 * ``Library-private'' definitions. 5 * ``Library-private'' definitions.
6 */ 6 */
7 7
8 -#include "tif_config.h" 8 -#include "tif_config.h"
9 +#include "tiffconf.h" 9 +#include "tiffconf.h"
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 */ 85 */
86 #include "tif_predict.h" 86 #include "tif_predict.h"
87 -#include "zlib.h" 87 -#include "zlib.h"
88 +#include "../zlib_v128/zlib.h" 88 +#include "../zlib_v128/zlib.h"
89 89
90 #include <stdio.h> 90 #include <stdio.h>
91 91
92 diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h 92 diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
93 --- /dev/null 93 --- /dev/null
94 +++ b/third_party/libtiff/tiffconf.h 94 +++ b/third_party/libtiff/tiffconf.h
95 @@ -0,0 +1,250 @@ 95 @@ -0,0 +1,248 @@
96 +/* libtiff/tiffconf.h. Generated by configure. */ 96 +/* libtiff/tiffconf.h. Generated by configure. */
97 +/* 97 +/*
98 + Configuration defines for installed libtiff. 98 + Configuration defines for installed libtiff.
99 + This file maintained for backward compatibility. Do not use definitions 99 + This file maintained for backward compatibility. Do not use definitions
100 + from this file in your programs. 100 + from this file in your programs.
101 +*/ 101 +*/
102 +#ifndef _TIFFCONF_ 102 +#ifndef _TIFFCONF_
103 +#define _TIFFCONF_ 103 +#define _TIFFCONF_
104 + 104 +
105 +#ifndef _FX_SYSTEM_H_ 105 +#include "core/include/fxcrt/fx_system.h"
106 +# include "../../core/include/fxcrt/fx_system.h"
107 +#endif
108 + 106 +
109 +//NOTE: The tiff codec requires an ANSI C compiler environment for building and 107 +//NOTE: The tiff codec requires an ANSI C compiler environment for building and
110 +// presumes an ANSI C environment for use. 108 +// presumes an ANSI C environment for use.
111 + 109 +
112 +/* Define to 1 if you have the <fcntl.h> header file. */ 110 +/* Define to 1 if you have the <fcntl.h> header file. */
113 +/* Define to 1 if you have the <sys/types.h> header file. */ 111 +/* Define to 1 if you have the <sys/types.h> header file. */
114 +#if _FX_OS_ == _FX_WIN32_MOBILE_ 112 +#if _FX_OS_ == _FX_WIN32_MOBILE_
115 +# define O_RDONLY 0x0000 /* open for reading only */ 113 +# define O_RDONLY 0x0000 /* open for reading only */
116 +# define O_WRONLY 0x0001 /* open for writing only */ 114 +# define O_WRONLY 0x0001 /* open for writing only */
117 +# define O_RDWR 0x0002 /* open for reading and writing */ 115 +# define O_RDWR 0x0002 /* open for reading and writing */
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 + * Macros stays here for backward compatibility and should be always defined. 334 + * Macros stays here for backward compatibility and should be always defined.
337 + */ 335 + */
338 +#define COLORIMETRY_SUPPORT 336 +#define COLORIMETRY_SUPPORT
339 +#define YCBCR_SUPPORT 337 +#define YCBCR_SUPPORT
340 +#define CMYK_SUPPORT 338 +#define CMYK_SUPPORT
341 +#define ICC_SUPPORT 339 +#define ICC_SUPPORT
342 +#define PHOTOSHOP_SUPPORT 340 +#define PHOTOSHOP_SUPPORT
343 +#define IPTC_SUPPORT 341 +#define IPTC_SUPPORT
344 + 342 +
345 +#endif /* _TIFFCONF_ */ 343 +#endif /* _TIFFCONF_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698