Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
05e11008
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
12 个月 前同步成功
通知
4
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Libpng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05e11008
编写于
11月 07, 2014
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] More "#endif" housecleaning, in *.h
上级
40656e98
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
32 addition
and
30 deletion
+32
-30
ANNOUNCE
ANNOUNCE
+1
-0
CHANGES
CHANGES
+1
-0
png.c
png.c
+4
-4
png.h
png.h
+17
-17
pnginfo.h
pnginfo.h
+1
-1
pngpriv.h
pngpriv.h
+6
-6
pngstruct.h
pngstruct.h
+2
-2
未找到文件。
ANNOUNCE
浏览文件 @
05e11008
...
...
@@ -71,6 +71,7 @@ Version 1.6.15beta07 [November 7, 2014]
needed by png_reciprocal2().
Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
png_do_swap().
Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
Version 1.6.15beta08 [November 7, 2014]
...
...
CHANGES
浏览文件 @
05e11008
...
...
@@ -5079,6 +5079,7 @@ Version 1.6.15beta07 [November 7, 2014]
needed by png_reciprocal2().
Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
png_do_swap().
Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
Version 1.6.15beta08 [November 7, 2014]
...
...
png.c
浏览文件 @
05e11008
...
...
@@ -3725,9 +3725,9 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
* convert this to a floating point value. This includes values that
* would overflow if 'value' were to be converted to 'int'.
*
* Apparently GCC, however, does an intermediate conver
t
ion to (int)
* Apparently GCC, however, does an intermediate conver
s
ion to (int)
* on some (ARM) but not all (x86) platforms, possibly because of
* hardware FP limitations. (E.g. if the hardware conver
t
ion always
* hardware FP limitations. (E.g. if the hardware conver
s
ion always
* assumes the integer register contains a signed value.) This results
* in ANSI-C undefined behavior for large values.
*
...
...
@@ -3735,7 +3735,7 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
* conformant and therefore compile spurious extra code for the large
* values.
*
* We can be reasonably sure that an unsigned to float conver
t
ion
* We can be reasonably sure that an unsigned to float conver
s
ion
* won't be faster than an int to float one. Therefore this code
* assumes responsibility for the undefined behavior, which it knows
* can't happen because of the check above.
...
...
@@ -3770,7 +3770,7 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
{
# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
/* The same (unsigned int)->(double) constraints apply here as above,
* however in this case the (unsigned int) to (int) conver
t
ion can
* however in this case the (unsigned int) to (int) conver
s
ion can
* overflow on an ANSI-C90 compliant system so the cast needs to ensure
* that this is not possible.
*/
...
...
png.h
浏览文件 @
05e11008
...
...
@@ -1177,7 +1177,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
/* Convert from time_t to png_time. Uses gmtime() */
PNG_EXPORT
(
25
,
void
,
png_convert_from_time_t
,
(
png_timep
ptime
,
time_t
ttime
));
#endif
/*
PNG_CONVERT_tIME_SUPPORTED
*/
#endif
/*
CONVERT_tIME
*/
#ifdef PNG_READ_EXPAND_SUPPORTED
/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
...
...
@@ -1383,7 +1383,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
PNG_EXPORT
(
40
,
void
,
png_set_add_alpha
,
(
png_structrp
png_ptr
,
png_uint_32
filler
,
int
flags
));
#endif
/*
PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED
*/
#endif
/*
READ_FILLER || WRITE_FILLER
*/
#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
/* Swap bytes in 16-bit depth files. */
...
...
@@ -1647,7 +1647,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
(
png_structrp
png_ptr
,
int
heuristic_method
,
int
num_weights
,
png_const_fixed_point_p
filter_weights
,
png_const_fixed_point_p
filter_costs
))
#endif
/*
PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
*/
#endif
/*
WRITE_WEIGHTED_FILTER
*/
/* Heuristic used for row filter selection. These defines should NOT be
* changed.
...
...
@@ -1703,7 +1703,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
PNG_EXPORT
(
226
,
void
,
png_set_text_compression_method
,
(
png_structrp
png_ptr
,
int
method
));
#endif
/*
PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
*/
#endif
/*
WRITE_CUSTOMIZE_ZTXT_COMPRESSION
*/
/* These next functions are called for input/output, memory, and error
* handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
...
...
@@ -1870,7 +1870,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
*/
PNG_EXPORT
(
93
,
void
,
png_progressive_combine_row
,
(
png_const_structrp
png_ptr
,
png_bytep
old_row
,
png_const_bytep
new_row
));
#endif
/* P
NG_PROGRESSIVE_READ_SUPPORTE
D */
#endif
/* P
ROGRESSIVE_REA
D */
PNG_EXPORTA
(
94
,
png_voidp
,
png_malloc
,
(
png_const_structrp
png_ptr
,
png_alloc_size_t
size
),
PNG_ALLOCATED
);
...
...
@@ -2071,7 +2071,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
PNG_EXPORT
(
129
,
png_int_32
,
png_get_y_offset_microns
,
(
png_const_structrp
png_ptr
,
png_const_inforp
info_ptr
));
#endif
/*
PNG_EASY_ACCESS_SUPPORTED
*/
#endif
/*
EASY_ACCESS
*/
#ifdef PNG_READ_SUPPORTED
/* Returns pointer to signature string read from PNG header */
...
...
@@ -2323,7 +2323,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
PNG_EXPORT
(
171
,
void
,
png_set_sCAL_s
,
(
png_const_structrp
png_ptr
,
png_inforp
info_ptr
,
int
unit
,
png_const_charp
swidth
,
png_const_charp
sheight
));
#endif
/*
PNG_sCAL_SUPPORTED
*/
#endif
/*
sCAL
*/
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
/* Provide the default handling for all unknown chunks or, optionally, for
...
...
@@ -2551,8 +2551,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
PNG_EXPORT
(
198
,
png_uint_32
,
png_get_pHYs_dpi
,
(
png_const_structrp
png_ptr
,
png_const_inforp
info_ptr
,
png_uint_32
*
res_x
,
png_uint_32
*
res_y
,
int
*
unit_type
));
# endif
/*
PNG_pHYs_SUPPORTED
*/
#endif
/*
PNG_INCH_CONVERSIONS_SUPPORTED
*/
# endif
/*
pHYs
*/
#endif
/*
INCH_CONVERSIONS
*/
/* Added in libpng-1.4.0 */
#ifdef PNG_IO_STATE_SUPPORTED
...
...
@@ -2575,7 +2575,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
# define PNG_IO_CHUNK_CRC 0x0080
/* currently at the chunk crc */
# define PNG_IO_MASK_OP 0x000f
/* current operation: reading/writing */
# define PNG_IO_MASK_LOC 0x00f0
/* current location: sig/hdr/data/crc */
#endif
/*
?PNG_IO_STATE_SUPPORTED
*/
#endif
/*
IO_STATE
*/
/* Interlace support. The following macros are always defined so that if
* libpng interlace handling is turned off the macros may be used to handle
...
...
@@ -2679,7 +2679,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
(composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
(png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
32767) / 65535)
#endif
/*
PNG_READ_COMPOSITE_NODIV_SUPPORTED
*/
#endif
/*
READ_COMPOSITE_NODIV
*/
#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
PNG_EXPORT
(
201
,
png_uint_32
,
png_get_uint_32
,
(
png_const_bytep
buf
));
...
...
@@ -3107,7 +3107,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
PNG_EXPORT
(
235
,
int
,
png_image_begin_read_from_stdio
,
(
png_imagep
image
,
FILE
*
file
));
/* The PNG header is read from the stdio FILE object. */
#endif
/*
PNG_STDIO_SUPPORTED
*/
#endif
/*
STDIO
*/
PNG_EXPORT
(
236
,
int
,
png_image_begin_read_from_memory
,
(
png_imagep
image
,
png_const_voidp
memory
,
png_size_t
size
));
...
...
@@ -3152,7 +3152,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
/* Free any data allocated by libpng in image->opaque, setting the pointer to
* NULL. May be called at any time after the structure is initialized.
*/
#endif
/*
PNG_SIMPLIFIED_READ_SUPPORTE
D */
#endif
/*
SIMPLIFIED_REA
D */
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
#ifdef PNG_STDIO_SUPPORTED
...
...
@@ -3198,12 +3198,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
*
* Note that the write API does not support interlacing or sub-8-bit pixels.
*/
#endif
/*
PNG_STDIO_SUPPORTED
*/
#endif
/*
PNG_SIMPLIFIED_WRITE_SUPPORTED
*/
#endif
/*
STDIO
*/
#endif
/*
SIMPLIFIED_WRITE
*/
/*******************************************************************************
* END OF SIMPLIFIED API
******************************************************************************/
#endif
/*
PNG_SIMPLIFIED_{READ|WRITE}_SUPPORTED
*/
#endif
/*
SIMPLIFIED_{READ|WRITE}
*/
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
PNG_EXPORT
(
242
,
void
,
png_set_check_for_invalid_index
,
...
...
@@ -3251,7 +3251,7 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
PNG_EXPORT
(
244
,
int
,
png_set_option
,
(
png_structrp
png_ptr
,
int
option
,
int
onoff
));
#endif
/*
PNG_SET_OPTION_SUPPORTED
*/
#endif
/*
SET_OPTION
*/
/*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS
...
...
pnginfo.h
浏览文件 @
05e11008
...
...
@@ -121,7 +121,7 @@ struct png_info_def
int
num_text
;
/* number of comments read or comments to write */
int
max_text
;
/* current size of text array */
png_textp
text
;
/* array of comments read or comments to write */
#endif
/*
PNG_TEXT_SUPPORTED
*/
#endif
/*
TEXT
*/
#ifdef PNG_tIME_SUPPORTED
/* The tIME chunk holds the last time the displayed image data was
...
...
pngpriv.h
浏览文件 @
05e11008
...
...
@@ -172,7 +172,7 @@
*/
# define PNG_ARM_NEON_IMPLEMENTATION 2
# endif
/* __ARM_NEON__ */
# endif
/* !
defined
PNG_ARM_NEON_IMPLEMENTATION */
# endif
/* !PNG_ARM_NEON_IMPLEMENTATION */
# ifndef PNG_ARM_NEON_IMPLEMENTATION
/* Use the intrinsics code by default. */
...
...
@@ -855,7 +855,7 @@ PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
/* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
* encoded value with maximum error 0.646365. Note that the input is not a
* 16-bit value; it has been multiplied by 255! */
#endif
/*
PNG_
SIMPLIFIED_READ/WRITE */
#endif
/* SIMPLIFIED_READ/WRITE */
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
...
...
@@ -1229,7 +1229,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
PNG_INTERNAL_FUNCTION
(
void
,
png_read_finish_row
,(
png_structrp
png_ptr
),
PNG_EMPTY
);
/* Finish a row while reading, dealing with interlacing passes, etc. */
#endif
/*
PNG_SEQUENTIAL_READ_SUPPORTE
D */
#endif
/*
SEQUENTIAL_REA
D */
/* Initialize the row buffers, etc. */
PNG_INTERNAL_FUNCTION
(
void
,
png_read_start_row
,(
png_structrp
png_ptr
),
PNG_EMPTY
);
...
...
@@ -1305,7 +1305,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
#ifdef PNG_READ_iCCP_SUPPORTED
PNG_INTERNAL_FUNCTION
(
void
,
png_handle_iCCP
,(
png_structrp
png_ptr
,
png_inforp
info_ptr
,
png_uint_32
length
),
PNG_EMPTY
);
#endif
/*
PNG_READ_iCCP_SUPPORTED
*/
#endif
/*
READ_iCCP
*/
#ifdef PNG_READ_iTXt_SUPPORTED
PNG_INTERNAL_FUNCTION
(
void
,
png_handle_iTXt
,(
png_structrp
png_ptr
,
...
...
@@ -1340,7 +1340,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
#ifdef PNG_READ_sPLT_SUPPORTED
PNG_INTERNAL_FUNCTION
(
void
,
png_handle_sPLT
,(
png_structrp
png_ptr
,
png_inforp
info_ptr
,
png_uint_32
length
),
PNG_EMPTY
);
#endif
/*
PNG_READ_sPLT_SUPPORTED
*/
#endif
/*
READ_sPLT
*/
#ifdef PNG_READ_sRGB_SUPPORTED
PNG_INTERNAL_FUNCTION
(
void
,
png_handle_sRGB
,(
png_structrp
png_ptr
,
...
...
@@ -1454,7 +1454,7 @@ PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
png_inforp
info_ptr
),
PNG_EMPTY
);
# endif
#endif
/* P
NG_PROGRESSIVE_READ_SUPPORTE
D */
#endif
/* P
ROGRESSIVE_REA
D */
/* Added at libpng version 1.6.0 */
#ifdef PNG_GAMMA_SUPPORTED
...
...
pngstruct.h
浏览文件 @
05e11008
...
...
@@ -274,7 +274,7 @@ struct png_struct_def
#ifdef PNG_READ_GAMMA_SUPPORTED
png_color_16
background_1
;
/* background normalized to gamma 1.0 */
#endif
#endif
/*
PNG_bKGD_SUPPORTE
D */
#endif
/*
bKG
D */
#ifdef PNG_WRITE_FLUSH_SUPPORTED
png_flush_ptr
output_flush_fn
;
/* Function for flushing output */
...
...
@@ -331,7 +331,7 @@ struct png_struct_def
int
process_mode
;
/* what push library is currently doing */
int
cur_palette
;
/* current push library palette index */
#endif
/* P
NG_PROGRESSIVE_READ_SUPPORTE
D */
#endif
/* P
ROGRESSIVE_REA
D */
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
/* For the Borland special 64K segment handler */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录