diff options
Diffstat (limited to 'source/blender/imbuf/intern/bmp.c')
-rw-r--r-- | source/blender/imbuf/intern/bmp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 0fd483b6b49..bdcf60090c3 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -30,13 +30,11 @@ #include "BLI_blenlib.h" #include "imbuf.h" -#include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "IMB_allocimbuf.h" -#include "IMB_cmap.h" -#include "IMB_bmp.h" +#include "IMB_filetype.h" /* some code copied from article on microsoft.com, copied here for enhanced BMP support in the future @@ -98,7 +96,7 @@ static int checkbmp(unsigned char *mem) return(ret_val); } -int imb_is_a_bmp(void *buf) { +int imb_is_a_bmp(unsigned char *buf) { return checkbmp(buf); } @@ -195,7 +193,7 @@ static int putShortLSB(unsigned short us,FILE *ofile) { } /* Found write info at http://users.ece.gatech.edu/~slabaugh/personal/c/bitmapUnix.c */ -short imb_savebmp(struct ImBuf *ibuf, char *name, int flags) { +int imb_savebmp(struct ImBuf *ibuf, char *name, int flags) { BMPINFOHEADER infoheader; int bytesize, extrabytes, x, y, t, ptr; @@ -207,7 +205,7 @@ short imb_savebmp(struct ImBuf *ibuf, char *name, int flags) { data = (uchar *) ibuf->rect; ofile = fopen(name,"wb"); - if (!ofile) return 0; + if (!ofile) return 0; putShortLSB(19778,ofile); /* "BM" */ putIntLSB(0,ofile); /* This can be 0 for BI_RGB bitmaps */ |