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/util.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/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 69390951a25..4c7b5fec2c4 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -44,6 +44,11 @@ #include "IMB_targa.h" #include "IMB_png.h" + +#ifdef WITH_DDS +#include "dds/dds_api.h" +#endif + #include "IMB_bmp.h" #include "IMB_tiff.h" #include "IMB_radiance_hdr.h" @@ -113,6 +118,9 @@ static int IMB_ispic_name(char *name) } if (imb_is_a_png(buf)) return(PNG); +#ifdef WITH_DDS + if (imb_is_a_dds((uchar *)buf)) return(DDS); +#endif if (imb_is_a_targa(buf)) return(TGA); #ifdef WITH_OPENEXR if (imb_is_a_openexr((uchar *)buf)) return(OPENEXR); @@ -162,6 +170,9 @@ int IMB_ispic(char *filename) || BLI_testextensie(filename, ".rgb") || BLI_testextensie(filename, ".bmp") || BLI_testextensie(filename, ".png") +#ifdef WITH_DDS + || BLI_testextensie(filename, ".dds") +#endif || BLI_testextensie(filename, ".iff") || BLI_testextensie(filename, ".lbm") || BLI_testextensie(filename, ".gif") @@ -188,6 +199,9 @@ int IMB_ispic(char *filename) || BLI_testextensie(filename, ".bmp") || BLI_testextensie(filename, ".png") || BLI_testextensie(filename, ".cin") +#ifdef WITH_DDS + || BLI_testextensie(filename, ".dds") +#endif #ifdef WITH_BF_OPENEXR || BLI_testextensie(filename, ".exr") #endif @@ -251,6 +265,7 @@ static int isffmpeg (char *filename) { if( BLI_testextensie(filename, ".swf") || BLI_testextensie(filename, ".jpg") || BLI_testextensie(filename, ".png") || + BLI_testextensie(filename, ".dds") || BLI_testextensie(filename, ".tga") || BLI_testextensie(filename, ".bmp") || BLI_testextensie(filename, ".exr") || |