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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/libpng/pngusr.h

Issue 140074: Updates the PNG library to 1.2.37, enables some functionality for O3D (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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 | « third_party/libpng/pngtrans.c ('k') | third_party/libpng/pngwio.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 21 matching lines...) Expand all
32 * the provisions above, a recipient may use your version of this file under 32 * the provisions above, a recipient may use your version of this file under
33 * the terms of any one of the MPL, the GPL or the LGPL. 33 * the terms of any one of the MPL, the GPL or the LGPL.
34 * 34 *
35 * ***** END LICENSE BLOCK ***** */ 35 * ***** END LICENSE BLOCK ***** */
36 36
37 #ifndef CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__ 37 #ifndef CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__
38 #define CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__ 38 #define CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__
39 39
40 #define PNG_NO_GLOBAL_ARRAYS 40 #define PNG_NO_GLOBAL_ARRAYS
41 41
42 #define PNG_NO_INFO_IMAGE 42 #undef PNG_NO_INFO_IMAGE
43 #define PNG_NO_READ_BACKGROUND 43 #define PNG_NO_READ_BACKGROUND
44 #define PNG_NO_READ_DITHER 44 #define PNG_NO_READ_DITHER
45 #define PNG_NO_READ_INVERT 45 #define PNG_NO_READ_INVERT
46 #define PNG_NO_READ_SHIFT 46 #define PNG_NO_READ_SHIFT
47 #define PNG_NO_READ_PACK 47 #define PNG_NO_READ_PACK
48 #define PNG_NO_READ_PACKSWAP 48 #define PNG_NO_READ_PACKSWAP
49 #define PNG_NO_READ_FILLER 49 #undef PNG_NO_READ_FILLER
50 #define PNG_NO_READ_SWAP_ALPHA 50 #define PNG_NO_READ_SWAP_ALPHA
51 #define PNG_NO_READ_INVERT_ALPHA 51 #define PNG_NO_READ_INVERT_ALPHA
52 #define PNG_NO_READ_RGB_TO_GRAY 52 #define PNG_NO_READ_RGB_TO_GRAY
53 #define PNG_NO_READ_USER_TRANSFORM 53 #define PNG_NO_READ_USER_TRANSFORM
54 #define PNG_NO_READ_bKGD 54 #define PNG_NO_READ_bKGD
55 #define PNG_NO_READ_cHRM 55 #define PNG_NO_READ_cHRM
56 #define PNG_NO_READ_hIST 56 #define PNG_NO_READ_hIST
57 #define PNG_NO_READ_iCCP 57 #define PNG_NO_READ_iCCP
58 #define PNG_NO_READ_pCAL 58 #define PNG_NO_READ_pCAL
59 #define PNG_NO_READ_pHYs 59 #define PNG_NO_READ_pHYs
(...skipping 10 matching lines...) Expand all
70 #define PNG_NO_READ_OPT_PLTE 70 #define PNG_NO_READ_OPT_PLTE
71 #define PNG_NO_MNG_FEATURES 71 #define PNG_NO_MNG_FEATURES
72 72
73 #ifdef CHROME_PNG_WRITE_SUPPORT 73 #ifdef CHROME_PNG_WRITE_SUPPORT
74 #define PNG_NO_WRITE_BACKGROUND 74 #define PNG_NO_WRITE_BACKGROUND
75 #define PNG_NO_WRITE_DITHER 75 #define PNG_NO_WRITE_DITHER
76 #define PNG_NO_WRITE_INVERT 76 #define PNG_NO_WRITE_INVERT
77 #define PNG_NO_WRITE_SHIFT 77 #define PNG_NO_WRITE_SHIFT
78 #define PNG_NO_WRITE_PACK 78 #define PNG_NO_WRITE_PACK
79 #define PNG_NO_WRITE_PACKSWAP 79 #define PNG_NO_WRITE_PACKSWAP
80 #define PNG_NO_WRITE_FILLER 80 #undef PNG_NO_WRITE_FILLER
81 #define PNG_NO_WRITE_SWAP_ALPHA 81 #define PNG_NO_WRITE_SWAP_ALPHA
82 #define PNG_NO_WRITE_INVERT_ALPHA 82 #define PNG_NO_WRITE_INVERT_ALPHA
83 #define PNG_NO_WRITE_RGB_TO_GRAY 83 #define PNG_NO_WRITE_RGB_TO_GRAY
84 #define PNG_NO_WRITE_USER_TRANSFORM 84 #define PNG_NO_WRITE_USER_TRANSFORM
85 #define PNG_NO_WRITE_bKGD 85 #define PNG_NO_WRITE_bKGD
86 #define PNG_NO_WRITE_cHRM 86 #define PNG_NO_WRITE_cHRM
87 #define PNG_NO_WRITE_hIST 87 #define PNG_NO_WRITE_hIST
88 #define PNG_NO_WRITE_iCCP 88 #define PNG_NO_WRITE_iCCP
89 #define PNG_NO_WRITE_pCAL 89 #define PNG_NO_WRITE_pCAL
90 #define PNG_NO_WRITE_pHYs 90 #define PNG_NO_WRITE_pHYs
(...skipping 12 matching lines...) Expand all
103 103
104 #define PNG_NO_READ_STRIP_ALPHA 104 #define PNG_NO_READ_STRIP_ALPHA
105 #define PNG_NO_USER_TRANSFORM_PTR 105 #define PNG_NO_USER_TRANSFORM_PTR
106 #define PNG_NO_READ_oFFs 106 #define PNG_NO_READ_oFFs
107 #define PNG_NO_HANDLE_AS_UNKNOWN 107 #define PNG_NO_HANDLE_AS_UNKNOWN
108 #define PNG_NO_CONSOLE_IO 108 #define PNG_NO_CONSOLE_IO
109 #define PNG_NO_ZALLOC_ZERO 109 #define PNG_NO_ZALLOC_ZERO
110 #define PNG_NO_ERROR_NUMBERS 110 #define PNG_NO_ERROR_NUMBERS
111 #define PNG_NO_EASY_ACCESS 111 #define PNG_NO_EASY_ACCESS
112 112
113 #define PNG_NO_SEQUENTIAL_READ_SUPPORTED 113 #undef PNG_NO_SEQUENTIAL_READ_SUPPORTED
114 114
115 /* Mangle names of exported libpng functions so different libpng versions 115 /* Mangle names of exported libpng functions so different libpng versions
116 can coexist. It is recommended that if you do this, you give your 116 can coexist. It is recommended that if you do this, you give your
117 library a different name such as "mozlibpng" instead of "libpng". */ 117 library a different name such as "mozlibpng" instead of "libpng". */
118 118
119 /* The following has been present since libpng-0.88, has never changed, and 119 /* The following has been present since libpng-0.88, has never changed, and
120 is unaffected by conditional compilation macros. It will not be mangled 120 is unaffected by conditional compilation macros. It will not be mangled
121 and it is the only choice for use in configure scripts for detecting the 121 and it is the only choice for use in configure scripts for detecting the
122 presence of any libpng version since 0.88. 122 presence of any libpng version since 0.88.
123 123
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 #define png_convert_size webkit_png_convert_size 434 #define png_convert_size webkit_png_convert_size
435 #define png_get_uint_31 webkit_png_get_uint_31 435 #define png_get_uint_31 webkit_png_get_uint_31
436 #define png_get_user_height_max webkit_png_get_user_height_max 436 #define png_get_user_height_max webkit_png_get_user_height_max
437 #define png_get_user_width_max webkit_png_get_user_width_max 437 #define png_get_user_width_max webkit_png_get_user_width_max
438 #define png_set_user_limits webkit_png_set_user_limits 438 #define png_set_user_limits webkit_png_set_user_limits
439 439
440 /* libpng-1.2.7 addition */ 440 /* libpng-1.2.7 addition */
441 #define png_set_add_alpha webkit_png_set_add_alpha 441 #define png_set_add_alpha webkit_png_set_add_alpha
442 442
443 #endif // CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__ 443 #endif // CHROME_THIRD_PARTY_LIBPNG_PNGUSR_H__
OLDNEW
« no previous file with comments | « third_party/libpng/pngtrans.c ('k') | third_party/libpng/pngwio.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698