dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't install webp/decode_vp8.h

Browse Source 
the VP8 decode functions do not need to be public; only
GetInfo/CheckSignature need to be marked extern as they're used by
libwebpmux.

Change-Id: Id9ab4d6166b0271cf5d04563c6dac1fcc84adbdc
This commit is contained in:
James Zern 2012-07-13 20:36:14 -07:00
parent 3ca7ce9805
commit ff771e7705
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -9,9 +9,11 @@ lib_LTLIBRARIES = libwebp.la
libwebp_la_SOURCES = libwebp_la_SOURCES =
libwebpinclude_HEADERS = libwebpinclude_HEADERS =
libwebpinclude_HEADERS += webp/decode.h libwebpinclude_HEADERS += webp/decode.h
libwebpinclude_HEADERS += webp/decode_vp8.h
libwebpinclude_HEADERS += webp/encode.h libwebpinclude_HEADERS += webp/encode.h
libwebpinclude_HEADERS += webp/types.h libwebpinclude_HEADERS += webp/types.h
noinst_HEADERS =
noinst_HEADERS += webp/decode_vp8.h
noinst_HEADERS += webp/format_constants.h
libwebp_la_LIBADD = libwebp_la_LIBADD =
libwebp_la_LIBADD += dec/libwebpdecode.la libwebp_la_LIBADD += dec/libwebpdecode.la

5
src/dec/Makefile.am
View File

@ -19,9 +19,10 @@ libwebpdecode_la_SOURCES += webpi.h
libwebpdecodeinclude_HEADERS = libwebpdecodeinclude_HEADERS =
libwebpdecodeinclude_HEADERS += ../webp/decode.h libwebpdecodeinclude_HEADERS += ../webp/decode.h
libwebpdecodeinclude_HEADERS += ../webp/decode_vp8.h
libwebpdecodeinclude_HEADERS += ../webp/types.h libwebpdecodeinclude_HEADERS += ../webp/types.h
noinst_HEADERS = ../webp/format_constants.h noinst_HEADERS =
noinst_HEADERS += ../webp/decode_vp8.h
noinst_HEADERS += ../webp/format_constants.h
libwebpdecode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE) libwebpdecode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE)
libwebpdecodeincludedir = $(includedir)/webp libwebpdecodeincludedir = $(includedir)/webp

18
src/webp/decode_vp8.h
View File

@ -106,12 +106,12 @@ struct VP8Io {
}; };
// Internal, version-checked, entry point // Internal, version-checked, entry point
WEBP_EXTERN(int) VP8InitIoInternal(VP8Io* const, int); int VP8InitIoInternal(VP8Io* const, int);
// Set the custom IO function pointers and user-data. The setter for IO hooks // Set the custom IO function pointers and user-data. The setter for IO hooks
// should be called before initiating incremental decoding. Returns true if // should be called before initiating incremental decoding. Returns true if
// WebPIDecoder object is successfully modified, false otherwise. // WebPIDecoder object is successfully modified, false otherwise.
WEBP_EXTERN(int) WebPISetIOHooks(WebPIDecoder* const idec, int WebPISetIOHooks(WebPIDecoder* const idec,
VP8IoPutHook put, VP8IoPutHook put,
VP8IoSetupHook setup, VP8IoSetupHook setup,
VP8IoTeardownHook teardown, VP8IoTeardownHook teardown,
@ -121,7 +121,7 @@ WEBP_EXTERN(int) WebPISetIOHooks(WebPIDecoder* const idec,
typedef struct VP8Decoder VP8Decoder; typedef struct VP8Decoder VP8Decoder;
// Create a new decoder object. // Create a new decoder object.
WEBP_EXTERN(VP8Decoder*) VP8New(void); VP8Decoder* VP8New(void);
// Must be called to make sure 'io' is initialized properly. // Must be called to make sure 'io' is initialized properly.
// Returns false in case of version mismatch. Upon such failure, no other // Returns false in case of version mismatch. Upon such failure, no other
@ -131,24 +131,24 @@ static WEBP_INLINE int VP8InitIo(VP8Io* const io) {
} }
// Start decoding a new picture. Returns true if ok. // Start decoding a new picture. Returns true if ok.
WEBP_EXTERN(int) VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io); int VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io);
// Decode a picture. Will call VP8GetHeaders() if it wasn't done already. // Decode a picture. Will call VP8GetHeaders() if it wasn't done already.
// Returns false in case of error. // Returns false in case of error.
WEBP_EXTERN(int) VP8Decode(VP8Decoder* const dec, VP8Io* const io); int VP8Decode(VP8Decoder* const dec, VP8Io* const io);
// Return current status of the decoder: // Return current status of the decoder:
WEBP_EXTERN(VP8StatusCode) VP8Status(VP8Decoder* const dec); VP8StatusCode VP8Status(VP8Decoder* const dec);
// return readable string corresponding to the last status. // return readable string corresponding to the last status.
WEBP_EXTERN(const char*) VP8StatusMessage(VP8Decoder* const dec); const char* VP8StatusMessage(VP8Decoder* const dec);
// Resets the decoder in its initial state, reclaiming memory. // Resets the decoder in its initial state, reclaiming memory.
// Not a mandatory call between calls to VP8Decode(). // Not a mandatory call between calls to VP8Decode().
WEBP_EXTERN(void) VP8Clear(VP8Decoder* const dec); void VP8Clear(VP8Decoder* const dec);
// Destroy the decoder object. // Destroy the decoder object.
WEBP_EXTERN(void) VP8Delete(VP8Decoder* const dec); void VP8Delete(VP8Decoder* const dec);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Miscellaneous VP8/VP8L bitstream probing functions. // Miscellaneous VP8/VP8L bitstream probing functions.