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/FreeImage/PluginDDS.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/FreeImage/PluginDDS.cpp')
| -rw-r--r-- | plugins/AdvaImg/src/FreeImage/PluginDDS.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/AdvaImg/src/FreeImage/PluginDDS.cpp b/plugins/AdvaImg/src/FreeImage/PluginDDS.cpp index 0a1667d7f1..639942388f 100644 --- a/plugins/AdvaImg/src/FreeImage/PluginDDS.cpp +++ b/plugins/AdvaImg/src/FreeImage/PluginDDS.cpp @@ -378,6 +378,10 @@ template <class DECODER> void DecodeDXTBlock (BYTE *dstData, const BYTE *srcBloc decoder.SetY (y); for (int x = 0; x < bw; x++) { decoder.GetColor (x, y, (Color8888 &)*dst); + +#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB + INPLACESWAP(dst[FI_RGBA_RED], dst[FI_RGBA_BLUE]); +#endif dst += 4; } } @@ -444,7 +448,7 @@ LoadDXT_Helper (FreeImageIO *io, fi_handle handle, int page, int flags, void *da typedef typename INFO::Block Block; Block *input_buffer = new(std::nothrow) Block[(width + 3) / 4]; - if (!input_buffer) return; + if(!input_buffer) return; int widthRest = (int) width & 3; int heightRest = (int) height & 3; |