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

Side by Side Diff: third_party/libpng/pngget.c

Issue 1372313004: Update to libpng 1.2.52 (rollup change only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « third_party/libpng/pnggccrd.c ('k') | third_party/libpng/pngpread.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 1
2 /* pngget.c - retrieval of values from info struct 2 /* pngget.c - retrieval of values from info struct
3 * 3 *
4 * Last changed in libpng 1.2.43 [February 25, 2010] 4 * Last changed in libpng 1.2.51 [February 6, 2014]
5 * Copyright (c) 1998-2010 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2014 Glenn Randers-Pehrson
6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
8 * 8 *
9 * This code is released under the libpng license. 9 * This code is released under the libpng license.
10 * For conditions of distribution and use, see the disclaimer 10 * For conditions of distribution and use, see the disclaimer
11 * and license in png.h 11 * and license in png.h
12 * 12 *
13 */ 13 */
14 14
15 #define PNG_INTERNAL 15 #define PNG_INTERNAL
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 { 886 {
887 /* Obsolete, to be removed from libpng-1.4.0 */ 887 /* Obsolete, to be removed from libpng-1.4.0 */
888 return (png_ptr? 0L: 0L); 888 return (png_ptr? 0L: 0L);
889 } 889 }
890 890
891 /* This function was added to libpng 1.2.0 and should exist by default */ 891 /* This function was added to libpng 1.2.0 and should exist by default */
892 png_uint_32 PNGAPI 892 png_uint_32 PNGAPI
893 png_get_asm_flagmask (int flag_select) 893 png_get_asm_flagmask (int flag_select)
894 { 894 {
895 /* Obsolete, to be removed from libpng-1.4.0 */ 895 /* Obsolete, to be removed from libpng-1.4.0 */
896 flag_select=flag_select; 896 PNG_UNUSED(flag_select)
897 return 0L; 897 return 0L;
898 } 898 }
899 899
900 /* GRR: could add this: && defined(PNG_MMX_CODE_SUPPORTED) */ 900 /* GRR: could add this: && defined(PNG_MMX_CODE_SUPPORTED) */
901 /* This function was added to libpng 1.2.0 */ 901 /* This function was added to libpng 1.2.0 */
902 png_uint_32 PNGAPI 902 png_uint_32 PNGAPI
903 png_get_mmx_flagmask (int flag_select, int *compilerID) 903 png_get_mmx_flagmask (int flag_select, int *compilerID)
904 { 904 {
905 /* Obsolete, to be removed from libpng-1.4.0 */ 905 /* Obsolete, to be removed from libpng-1.4.0 */
906 flag_select=flag_select; 906 PNG_UNUSED(flag_select)
907 *compilerID = -1; /* unknown (i.e., no asm/MMX code compiled) */ 907 *compilerID = -1; /* unknown (i.e., no asm/MMX code compiled) */
908 return 0L; 908 return 0L;
909 } 909 }
910 910
911 /* This function was added to libpng 1.2.0 */ 911 /* This function was added to libpng 1.2.0 */
912 png_byte PNGAPI 912 png_byte PNGAPI
913 png_get_mmx_bitdepth_threshold (png_structp png_ptr) 913 png_get_mmx_bitdepth_threshold (png_structp png_ptr)
914 { 914 {
915 /* Obsolete, to be removed from libpng-1.4.0 */ 915 /* Obsolete, to be removed from libpng-1.4.0 */
916 return (png_ptr? 0: 0); 916 return (png_ptr? 0: 0);
(...skipping 18 matching lines...) Expand all
935 return (png_ptr? png_ptr->user_width_max : 0); 935 return (png_ptr? png_ptr->user_width_max : 0);
936 } 936 }
937 png_uint_32 PNGAPI 937 png_uint_32 PNGAPI
938 png_get_user_height_max (png_structp png_ptr) 938 png_get_user_height_max (png_structp png_ptr)
939 { 939 {
940 return (png_ptr? png_ptr->user_height_max : 0); 940 return (png_ptr? png_ptr->user_height_max : 0);
941 } 941 }
942 #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */ 942 #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
943 943
944 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ 944 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
OLDNEW
« no previous file with comments | « third_party/libpng/pnggccrd.c ('k') | third_party/libpng/pngpread.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698