[master] Added PNG_CONVERT_tIME_SUPPORTED macro.

This commit is contained in:
Glenn Randers-Pehrson 2009-11-02 11:26:10 -06:00
parent d8bf20d9ac
commit 6dcfbc479d
4 changed files with 13 additions and 5 deletions

View File

@ -112,6 +112,7 @@ version 1.2.41beta12 [November 2, 2009]
version 1.2.41beta13 [November 2, 2009] version 1.2.41beta13 [November 2, 2009]
Updated scripts/pngw32.def Updated scripts/pngw32.def
Patched ltmain.sh for wince support. Patched ltmain.sh for wince support.
Added PNG_CONVERT_tIME_SUPPORTED macro.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2542,6 +2542,7 @@ version 1.2.41beta12 [November 2, 2009]
version 1.2.41beta13 [November 2, 2009] version 1.2.41beta13 [November 2, 2009]
Updated scripts/pngw32.def Updated scripts/pngw32.def
Patched ltmain.sh for wince support. Patched ltmain.sh for wince support.
Added PNG_CONVERT_tIME_SUPPORTED macro.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

7
png.h
View File

@ -1651,18 +1651,15 @@ extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
PNGARG((png_structp png_ptr, png_timep ptime)); PNGARG((png_structp png_ptr, png_timep ptime));
#endif #endif
#ifdef PNG_WRITE_tIME_SUPPORTED #ifdef PNG_CONVERT_tIME_SUPPORTED
/* Convert from a struct tm to png_time */ /* Convert from a struct tm to png_time */
# ifndef _WIN32_WCE
/* "tm" structure is not supported on WindowsCE */
extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime, extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
struct tm FAR * ttime)); struct tm FAR * ttime));
/* Convert from time_t to png_time. Uses gmtime() */ /* Convert from time_t to png_time. Uses gmtime() */
extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime, extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
time_t ttime)); time_t ttime));
# endif /* _WIN32_WCE */ #endif /* PNG_CONVERT_tIME_SUPPORTED */
#endif /* PNG_WRITE_tIME_SUPPORTED */
#ifdef PNG_READ_EXPAND_SUPPORTED #ifdef PNG_READ_EXPAND_SUPPORTED
/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */ /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */

View File

@ -1162,6 +1162,15 @@
# endif # endif
#endif #endif
#ifndef PNG_NO_CONVERT_tIME
# ifndef _WIN32_WCE
/* The "tm" structure is not supported on WindowsCE */
# ifndef PNG_CONVERT_tIME_SUPPORTED
# define PNG_CONVERT_tIME_SUPPORTED
# endif
# endif
#endif
#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */ #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
#if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED) #if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED)