diff options
| author | Kent Mein <mein@cs.umn.edu> | 2007-06-25 23:50:25 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2007-06-25 23:50:25 +0400 |
| commit | 613646b33e5fde13158a8d8644df8c97bdde2fbb (patch) | |
| tree | 9b50512d8f6052e28daa54704e4aff112a4ca102 /source/blender/imbuf/intern/readimage.c | |
| parent | ddc68225c24bc0754d7b81434b06f509d1f0e106 (diff) | |
This commit is a modified version of patch #6860
It adds read only dds support. (Writing will come later)
Kent
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index bfa6200d23b..c5901ccad90 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -59,6 +59,10 @@ #include "openexr/openexr_api.h" #endif +#ifdef WITH_DDS +#include "dds/dds_api.h" +#endif + #ifdef WITH_QUICKTIME #if defined(_WIN32) || defined (__APPLE__) #include "quicktime_import.h" @@ -153,6 +157,11 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { ibuf = imb_load_openexr((uchar *)mem, size, flags); if (ibuf) return (ibuf); #endif + +#ifdef WITH_DDS + ibuf = imb_load_dds((uchar *)mem, size, flags); + if (ibuf) return (ibuf); +#endif #ifdef WITH_QUICKTIME #if defined(_WIN32) || defined (__APPLE__) |