diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-01-03 14:34:48 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-01-03 14:34:48 +0000 |
| commit | eb680766d56e815086397361b286fd8055fb5377 (patch) | |
| tree | 7994cdb0d9077f645ba7fd06bdd2cde32cf599d4 /plugins/AdvaImg/src/FreeImageToolkit/Display.cpp | |
| parent | ec61686c3d96f49eb7f40a4208690a0781d63e29 (diff) | |
FreeImage updated to 3.15.4
removed not used formats
git-svn-id: http://svn.miranda-ng.org/main/trunk@2926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AdvaImg/src/FreeImageToolkit/Display.cpp')
| -rw-r--r-- | plugins/AdvaImg/src/FreeImageToolkit/Display.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp index 3e4807042d..245c5c3a18 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp @@ -40,20 +40,20 @@ For colour images, the computation is done separately for R, G, and B samples. */ FIBITMAP * DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP *bg) { - if (!FreeImage_HasPixels(fg)) return NULL; + if(!FreeImage_HasPixels(fg)) return NULL; int width = FreeImage_GetWidth(fg); int height = FreeImage_GetHeight(fg); int bpp = FreeImage_GetBPP(fg); - if ((bpp != 8) && (bpp != 32)) + if((bpp != 8) && (bpp != 32)) return NULL; if(bg) { int bg_width = FreeImage_GetWidth(bg); int bg_height = FreeImage_GetHeight(bg); int bg_bpp = FreeImage_GetBPP(bg); - if ((bg_width != width) || (bg_height != height) || (bg_bpp != 24)) + if((bg_width != width) || (bg_height != height) || (bg_bpp != 24)) return NULL; } @@ -71,7 +71,7 @@ FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP // allocate the composite image FIBITMAP *composite = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if (!composite) return NULL; + if(!composite) return NULL; // get the palette RGBQUAD *pal = FreeImage_GetPalette(fg); @@ -133,7 +133,7 @@ FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP // background color - if (!bHasBkColor) { + if(!bHasBkColor) { if(bg) { // get the background color from the background image bkc.rgbBlue = bg_bits[FI_RGBA_BLUE]; |