diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
| commit | 2df82a2a2be909e0a1208ed2fe41637f24436414 (patch) | |
| tree | a89c92df23c951a8dc31cffd58b999545e058ac9 /source/blender/imbuf/IMB_imbuf_types.h | |
| parent | d6f38e4e018a75458290e3ed26dd80c2cf0af882 (diff) | |
Code cleanup: fix some vs2012 compiler warnings
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf_types.h')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index dde8d4d4ab7..1734073dd6c 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -248,24 +248,24 @@ typedef struct ImBuf { /* dds */ #ifdef WITH_DDS -#ifndef MAKEFOURCC -#define MAKEFOURCC(ch0, ch1, ch2, ch3)\ +#ifndef DDS_MAKEFOURCC +#define DDS_MAKEFOURCC(ch0, ch1, ch2, ch3)\ ((unsigned long)(unsigned char)(ch0) | \ ((unsigned long)(unsigned char)(ch1) << 8) | \ ((unsigned long)(unsigned char)(ch2) << 16) | \ ((unsigned long)(unsigned char)(ch3) << 24)) -#endif /* MAKEFOURCC */ +#endif /* DDS_MAKEFOURCC */ /* * FOURCC codes for DX compressed-texture pixel formats */ -#define FOURCC_DDS (MAKEFOURCC('D','D','S',' ')) -#define FOURCC_DXT1 (MAKEFOURCC('D','X','T','1')) -#define FOURCC_DXT2 (MAKEFOURCC('D','X','T','2')) -#define FOURCC_DXT3 (MAKEFOURCC('D','X','T','3')) -#define FOURCC_DXT4 (MAKEFOURCC('D','X','T','4')) -#define FOURCC_DXT5 (MAKEFOURCC('D','X','T','5')) +#define FOURCC_DDS (DDS_MAKEFOURCC('D','D','S',' ')) +#define FOURCC_DXT1 (DDS_MAKEFOURCC('D','X','T','1')) +#define FOURCC_DXT2 (DDS_MAKEFOURCC('D','X','T','2')) +#define FOURCC_DXT3 (DDS_MAKEFOURCC('D','X','T','3')) +#define FOURCC_DXT4 (DDS_MAKEFOURCC('D','X','T','4')) +#define FOURCC_DXT5 (DDS_MAKEFOURCC('D','X','T','5')) #endif /* DDS */ extern const char *imb_ext_image[]; |