Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/bmp.c')
-rw-r--r--source/blender/imbuf/intern/bmp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c
index cf2638071bb..d79acc88a80 100644
--- a/source/blender/imbuf/intern/bmp.c
+++ b/source/blender/imbuf/intern/bmp.c
@@ -27,6 +27,11 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/** \file blender/imbuf/intern/bmp.c
+ * \ingroup imbuf
+ */
+
+
#include "BLI_blenlib.h"
#include "imbuf.h"
@@ -103,7 +108,7 @@ int imb_is_a_bmp(unsigned char *buf) {
struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags)
{
- struct ImBuf *ibuf = 0;
+ struct ImBuf *ibuf = NULL;
BMPINFOHEADER bmi;
int x, y, depth, skip, i;
unsigned char *bmp, *rect;
@@ -111,7 +116,7 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags)
(void)size; /* unused */
- if (checkbmp(mem) == 0) return(0);
+ if (checkbmp(mem) == 0) return(NULL);
if ((mem[0] == 'B') && (mem[1] == 'M')) {
/* skip fileheader */