[Bf-blender-cvs] [e3c416e] KTX_support: Revert conversion to long long for KTX branch

[Antony Riakiotakis]

Commit: e3c416e938fd269664ef571dd19a871bf7b64370
Author: Antony Riakiotakis
Date:   Mon Jun 8 12:30:06 2015 +0200
Branches: KTX_support
https://developer.blender.org/rBe3c416e938fd269664ef571dd19a871bf7b64370

Revert conversion to long long for KTX branch

===================================================================

M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/imbuf/intern/IMB_filetype.h
M	source/blender/imbuf/intern/filetype.c
M	source/blender/imbuf/intern/util.c

===================================================================

diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 805e1a7..ed16c67 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -391,7 +391,7 @@ struct ImBuf *IMB_prepare_write_ImBuf(const bool isfloat, struct ImBuf *ibuf);
  * \attention Defined in util.c
  */
 bool IMB_ispic(const char *name);
-long long int  IMB_ispic_type(const char *name);
+int  IMB_ispic_type(const char *name);
 
 /**
  *
diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h
index 39f9f4d..df000c2 100644
--- a/source/blender/imbuf/intern/IMB_filetype.h
+++ b/source/blender/imbuf/intern/IMB_filetype.h
@@ -40,14 +40,14 @@ typedef struct ImFileType {
 
 	int (*is_a)(unsigned char *buf);
 	int (*is_a_filepath)(const char *name);
-	long long int (*ftype)(const struct ImFileType *type, struct ImBuf *ibuf);
+	int (*ftype)(const struct ImFileType *type, struct ImBuf *ibuf);
 	struct ImBuf *(*load)(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]);
 	struct ImBuf *(*load_filepath)(const char *name, int flags, char colorspace[IM_MAX_SPACE]);
 	int (*save)(struct ImBuf *ibuf, const char *name, int flags);
 	void (*load_tile)(struct ImBuf *ibuf, unsigned char *mem, size_t size, int tx, int ty, unsigned int *rect);
 
 	int flag;
-	long long int filetype;
+	int filetype;
 	int default_save_role;
 } ImFileType;
 
diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c
index 7f3ac32..9a48410 100644
--- a/source/blender/imbuf/intern/filetype.c
+++ b/source/blender/imbuf/intern/filetype.c
@@ -51,11 +51,11 @@
 #include "quicktime_import.h"
 #endif
 
-static long long int imb_ftype_default(const ImFileType *type, ImBuf *ibuf)
+static int imb_ftype_default(const ImFileType *type, ImBuf *ibuf)
 {
 	return (ibuf->ftype == type->filetype);
 }
-static long long int imb_ftype_iris(const ImFileType *type, ImBuf *ibuf)
+static int imb_ftype_iris(const ImFileType *type, ImBuf *ibuf)
 {
 	(void)type;
 	return (ibuf->ftype == IMAGIC);
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index e8437d2..464b9ca 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -184,7 +184,7 @@ const char *imb_ext_audio[] = {
 	NULL
 };
 
-long long int IMB_ispic_type(const char *name)
+int IMB_ispic_type(const char *name)
 {
 	/* increased from 32 to 64 because of the bitmaps header size */
 #define HEADER_SIZE 64