dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-31 10:25:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "wicdec: (msvs) quiet some /analyze warnings"

Browse Source
This commit is contained in:
pascal massimino
2015-01-17 12:15:16 -08:00
committed by Gerrit Code Review
parent daeb276a2b 9b228b5416
commit b8c2013512
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/wicdec.c
View File

@@ -15,6 +15,7 @@
#include "webp/config.h" #include "webp/config.h"
#endif #endif
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_WINCODEC_H #ifdef HAVE_WINCODEC_H
@@ -109,6 +110,7 @@ static HRESULT ExtractICCP(IWICImagingFactory* const factory,
IFS(IWICBitmapFrameDecode_GetColorContexts(frame, IFS(IWICBitmapFrameDecode_GetColorContexts(frame,
count, color_contexts, count, color_contexts,
&num_color_contexts)); &num_color_contexts));
assert(FAILED(hr) || num_color_contexts <= count);
for (i = 0; SUCCEEDED(hr) && i < num_color_contexts; ++i) { for (i = 0; SUCCEEDED(hr) && i < num_color_contexts; ++i) {
WICColorContextType type; WICColorContextType type;
IFS(IWICColorContext_GetType(color_contexts[i], &type)); IFS(IWICColorContext_GetType(color_contexts[i], &type));
@@ -116,7 +118,7 @@ static HRESULT ExtractICCP(IWICImagingFactory* const factory,
UINT size; UINT size;
IFS(IWICColorContext_GetProfileBytes(color_contexts[i], IFS(IWICColorContext_GetProfileBytes(color_contexts[i],
0, NULL, &size)); 0, NULL, &size));
if (size > 0) { if (SUCCEEDED(hr) && size > 0) {
iccp->bytes = (uint8_t*)malloc(size); iccp->bytes = (uint8_t*)malloc(size);
if (iccp->bytes == NULL) { if (iccp->bytes == NULL) {
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
@@ -261,7 +263,7 @@ int ReadPictureWithWIC(const char* const filename,
IFS(IWICBitmapFrameDecode_GetPixelFormat(frame, &src_pixel_format)); IFS(IWICBitmapFrameDecode_GetPixelFormat(frame, &src_pixel_format));
IFS(IWICBitmapDecoder_GetContainerFormat(decoder, &src_container_format)); IFS(IWICBitmapDecoder_GetContainerFormat(decoder, &src_container_format));
if (keep_alpha) { if (SUCCEEDED(hr) && keep_alpha) {
const GUID** guid; const GUID** guid;
for (guid = kAlphaContainers; *guid != NULL; ++guid) { for (guid = kAlphaContainers; *guid != NULL; ++guid) {
if (IsEqualGUID(MAKE_REFGUID(src_container_format), if (IsEqualGUID(MAKE_REFGUID(src_container_format),