mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[libpng17] Fixed ARM support (Mans Rullgard).
Also removed stray out-of-order #endif and #ifdef
This commit is contained in:
parent
81892f6b90
commit
4245e6b1b2
2
ANNOUNCE
2
ANNOUNCE
@ -123,6 +123,8 @@ Version 1.7.0alpha10 [February 5, 2013]
|
|||||||
Added png_get_palette_max() function.
|
Added png_get_palette_max() function.
|
||||||
Changed png_size_t to size_t throughout headers, make sRGB check numbers
|
Changed png_size_t to size_t throughout headers, make sRGB check numbers
|
||||||
consistent.
|
consistent.
|
||||||
|
Fixed ARM support (Mans Rullgard).
|
||||||
|
Removed stray out-of-order #endif and #ifdef (Mans Rullgard).
|
||||||
|
|
||||||
===========================================================================
|
===========================================================================
|
||||||
NOTICE November 17, 2012:
|
NOTICE November 17, 2012:
|
||||||
|
|||||||
4
CHANGES
4
CHANGES
@ -4409,6 +4409,10 @@ Version 1.7.0alpha10 [February 5, 2013]
|
|||||||
Added png_get_palette_max() function.
|
Added png_get_palette_max() function.
|
||||||
Changed png_size_t to size_t throughout headers, make sRGB check numbers
|
Changed png_size_t to size_t throughout headers, make sRGB check numbers
|
||||||
consistent.
|
consistent.
|
||||||
|
Ported libpng 1.5 options.awk/dfn file handling to 1.7, fixed one bug.
|
||||||
|
Fixed ARM support (Mans Rullgard).
|
||||||
|
Removed stray out-of-order #endif and #ifdef (Mans Rullgard).
|
||||||
|
|
||||||
|
|
||||||
===========================================================================
|
===========================================================================
|
||||||
NOTICE November 17, 2012:
|
NOTICE November 17, 2012:
|
||||||
|
|||||||
@ -194,8 +194,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "png.h"
|
|
||||||
|
|
||||||
/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
|
/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
|
||||||
#ifndef PNG_DLL_EXPORT
|
#ifndef PNG_DLL_EXPORT
|
||||||
# define PNG_DLL_EXPORT
|
# define PNG_DLL_EXPORT
|
||||||
@ -328,6 +326,7 @@
|
|||||||
# define PNGFAPI /* PRIVATE */
|
# define PNGFAPI /* PRIVATE */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef PNG_VERSION_INFO_ONLY
|
||||||
/* Other defines specific to compilers can go here. Try to keep
|
/* Other defines specific to compilers can go here. Try to keep
|
||||||
* them inside an appropriate ifdef/endif pair for portability.
|
* them inside an appropriate ifdef/endif pair for portability.
|
||||||
*/
|
*/
|
||||||
@ -369,6 +368,7 @@
|
|||||||
# include <m68881.h>
|
# include <m68881.h>
|
||||||
# endif
|
# endif
|
||||||
#endif /* FLOATING_ARITHMETIC || FLOATING_POINT */
|
#endif /* FLOATING_ARITHMETIC || FLOATING_POINT */
|
||||||
|
#endif /* VERSION_INFO_ONLY */
|
||||||
|
|
||||||
/* These macros may need to be architecture dependent. */
|
/* These macros may need to be architecture dependent. */
|
||||||
#define PNG_ALIGN_NONE 0 /* do not use data alignment */
|
#define PNG_ALIGN_NONE 0 /* do not use data alignment */
|
||||||
@ -539,7 +539,6 @@
|
|||||||
/* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
|
/* 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
|
* encoded value with maximum error 0.646365. Note that the input is not a
|
||||||
* 16-bit value; it has been multiplied by 255! */
|
* 16-bit value; it has been multiplied by 255! */
|
||||||
#endif /* PNG_SIMPLIFIED_READ/WRITE */
|
|
||||||
|
|
||||||
/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255
|
/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255
|
||||||
* by dividing by 257 *with rounding*. This macro is exact for the given range.
|
* by dividing by 257 *with rounding*. This macro is exact for the given range.
|
||||||
@ -680,6 +679,7 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef PNG_VERSION_INFO_ONLY
|
#ifndef PNG_VERSION_INFO_ONLY
|
||||||
|
|
||||||
|
#include "png.h"
|
||||||
#include "pngstruct.h"
|
#include "pngstruct.h"
|
||||||
#include "pnginfo.h"
|
#include "pnginfo.h"
|
||||||
|
|
||||||
@ -691,7 +691,6 @@ typedef const png_uint_16p * png_const_uint_16pp;
|
|||||||
/* Added to libpng-1.5.7: sRGB conversion tables */
|
/* Added to libpng-1.5.7: sRGB conversion tables */
|
||||||
#if defined PNG_SIMPLIFIED_READ_SUPPORTED ||\
|
#if defined PNG_SIMPLIFIED_READ_SUPPORTED ||\
|
||||||
defined PNG_SIMPLIFIED_WRITE_SUPPORTED
|
defined PNG_SIMPLIFIED_WRITE_SUPPORTED
|
||||||
#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
|
|
||||||
PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);
|
PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);
|
||||||
/* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,
|
/* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,
|
||||||
* 0..65535. This table gives the closest 16-bit answers (no errors).
|
* 0..65535. This table gives the closest 16-bit answers (no errors).
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user