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 "examples: (windows/WIC) add alpha support"

Browse Source
This commit is contained in:
James Zern
2011-07-08 14:10:17 -07:00
committed by Code Review
parent e291fae0fc 3cfe0888ae
commit 3827e1bce4
2 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/dwebp.c
View File

@ -86,13 +86,14 @@ static HRESULT CreateOutputStream(const char* out_file_name,
static HRESULT WriteUsingWIC(const char* out_file_name, REFGUID container_guid,
unsigned char* rgb, int stride,
uint32_t width, uint32_t height) {
uint32_t width, uint32_t height, int has_alpha) {
HRESULT hr = S_OK;
IWICImagingFactory* pFactory = NULL;
IWICBitmapFrameEncode* pFrame = NULL;
IWICBitmapEncoder* pEncoder = NULL;
IStream* pStream = NULL;
GUID pixel_format = GUID_WICPixelFormat24bppBGR;
WICPixelFormatGUID pixel_format = has_alpha ? GUID_WICPixelFormat32bppBGRA
: GUID_WICPixelFormat24bppBGR;
IFS(CoInitialize(NULL));
IFS(CoCreateInstance(MAKE_REFGUID(CLSID_WICImagingFactory), NULL,
@ -130,11 +131,11 @@ static int WritePNG(const char* out_file_name,
const uint32_t height = buffer->height;
unsigned char* const rgb = buffer->u.RGBA.rgba;
const int stride = buffer->u.RGBA.stride;
const int has_alpha = (buffer->colorspace == MODE_RGBA);
assert(!has_alpha); // TODO(mikolaj)
const int has_alpha = (buffer->colorspace == MODE_BGRA);
return SUCCEEDED(WriteUsingWIC(out_file_name,
MAKE_REFGUID(GUID_ContainerFormatPng), rgb, stride, width,
height));
height, has_alpha));
}
#elif defined(WEBP_HAVE_PNG) // !HAVE_WINCODEC_H
@ -266,7 +267,7 @@ static void SaveOutput(const WebPDecBuffer* const buffer,
if (verbose)
StopwatchReadAndReset(&stop_watch);
#ifdef _WIN32
#ifdef HAVE_WINCODEC_H
needs_open_file = (format != PNG);
#endif
if (needs_open_file) {
@ -431,9 +432,8 @@ int main(int argc, const char *argv[]) {
switch (format) {
case PNG:
#ifdef _WIN32
// TODO(mikolaj): no alpha for now
output_buffer->colorspace = MODE_BGR;
#ifdef HAVE_WINCODEC_H
output_buffer->colorspace = bitstream->has_alpha ? MODE_BGRA : MODE_BGR;
#else
output_buffer->colorspace = bitstream->has_alpha ? MODE_RGBA : MODE_RGB;
#endif