dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-13 14:34:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "configure: mingw32 targets: test for WIC support"

Browse Source
This commit is contained in:
pascal massimino
2011-06-10 16:11:51 -07:00
committed by Code Review
parent a11009d7fc 31f9dc6fdd
commit ea43f045b5
4 changed files with 76 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/dwebp.c
View File

@ -17,11 +17,18 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef WEBP_HAVE_PNG
#include <png.h>
#endif
#ifdef _WIN32
#ifdef HAVE_WINCODEC_H
#ifdef __MINGW32__
#define INITGUID // Without this GUIDs are declared extern and fail to link
#endif
#define CINTERFACE
#define COBJMACROS
#define _WIN32_IE 0x500 // Workaround bug in shlwapi.h when compiling C++
@ -44,7 +51,7 @@ extern void* VP8DecGetCPUInfo; // opaque forward declaration.
static int verbose = 0;
#ifdef _WIN32
#ifdef HAVE_WINCODEC_H
#define IFS(fn) \
do { \
@ -118,7 +125,7 @@ static int WritePNG(const char* out_file_name, unsigned char* rgb, int stride,
height));
}
#elif defined(WEBP_HAVE_PNG) // !WIN32
#elif defined(WEBP_HAVE_PNG) // !HAVE_WINCODEC_H
static void PNGAPI error_function(png_structp png, png_const_charp dummy) {
(void)dummy; // remove variable-unused warning
longjmp(png_jmpbuf(png), 1);
@ -158,7 +165,7 @@ static int WritePNG(FILE* out_file, unsigned char* rgb, int stride,
png_destroy_write_struct(&png, &info);
return 1;
}
#else // !WIN32 && !WEBP_HAVE_PNG
#else // !HAVE_WINCODEC_H && !WEBP_HAVE_PNG
typedef uint32_t png_uint_32;
@ -364,7 +371,7 @@ int main(int argc, const char *argv[]) {
if (!needs_open_file || fout) {
int ok = 1;
if (format == PNG) {
#ifdef _WIN32
#ifdef HAVE_WINCODEC_H
ok &= WritePNG(out_file, out, stride, width, height, has_alpha);
#else
ok &= WritePNG(fout, out, stride, width, height, has_alpha);