add support for PNG output (default)

regularize include guards

Change-Id: Ia1d0fa49c8c98e2c11f775b839d04a24e5450170
This commit is contained in:
Pascal Massimino
2011-01-31 22:00:33 -08:00
parent 860641df3f
commit 1dc4611a3a
17 changed files with 714 additions and 54 deletions

View File

@ -128,6 +128,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPNG_CONFIG = @LIBPNG_CONFIG@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
@ -149,6 +150,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PNG_INCLUDES = @PNG_INCLUDES@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_BITS_H_
#define WEBP_DECODE_BITS_H_
#ifndef WEBP_DEC_BITS_H_
#define WEBP_DEC_BITS_H_
#include <assert.h>
#include "webp/decode_vp8.h"
@ -103,4 +103,4 @@ static inline int VP8GetSigned(VP8BitReader* const br, int v) {
} // extern "C"
#endif
#endif // WEBP_DECODE_BITS_H_
#endif // WEBP_DEC_BITS_H_

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_VP8I_H_
#define WEBP_DECODE_VP8I_H_
#ifndef WEBP_DEC_VP8I_H_
#define WEBP_DEC_VP8I_H_
#include <string.h> // for memcpy()
#include "bits.h"
@ -313,4 +313,4 @@ extern VP8ChromaFilterFunc VP8HFilter8i;
} // extern "C"
#endif
#endif // WEBP_DECODE_VP8I_H_
#endif // WEBP_DEC_VP8I_H_

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_YUV_H_
#define WEBP_DECODE_YUV_H_
#ifndef WEBP_DEC_YUV_H_
#define WEBP_DEC_YUV_H_
#include "webp/decode_vp8.h"
@ -63,4 +63,4 @@ void VP8YUVInit();
} // extern "C"
#endif
#endif // WEBP_DECODE_YUV_H_
#endif // WEBP_DEC_YUV_H_

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_WEBP_DECODE_H_
#define WEBP_DECODE_WEBP_DECODE_H_
#ifndef WEBP_WEBP_DECODE_H_
#define WEBP_WEBP_DECODE_H_
#include "webp/types.h"
@ -96,4 +96,4 @@ uint8_t* WebPDecodeYUVInto(const uint8_t* data, uint32_t data_size,
} // extern "C"
#endif
#endif // WEBP_DECODE_WEBP_DECODE_H_
#endif // WEBP_WEBP_DECODE_H_

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_WEBP_DECODE_VP8_H_
#define WEBP_DECODE_WEBP_DECODE_VP8_H_
#ifndef WEBP_WEBP_DECODE_VP8_H_
#define WEBP_WEBP_DECODE_VP8_H_
#include "decode.h"
@ -112,4 +112,4 @@ void VP8Delete(VP8Decoder* const dec);
} // extern "C"
#endif
#endif // WEBP_DECODE_WEBP_DECODE_VP8_H_
#endif // WEBP_WEBP_DECODE_VP8_H_

View File

@ -9,8 +9,8 @@
//
// Author: Skal (pascal.massimino@gmail.com)
#ifndef WEBP_DECODE_WEBP_TYPES_H_
#define WEBP_DECODE_WEBP_TYPES_H_
#ifndef WEBP_WEBP_TYPES_H_
#define WEBP_WEBP_TYPES_H_
#ifndef _MSC_VER
#include <inttypes.h>
@ -25,4 +25,4 @@ typedef unsigned long long int uint64_t;
#define inline __forceinline
#endif /* _MSC_VER */
#endif /* WEBP_DECODE_WEBP_TYPES_H_ */
#endif /* WEBP_WEBP_TYPES_H_ */