pass image description to image loading functions for more useful error than 'Unknown fileformat'.

4 files changed, 42 insertions, 41 deletions

diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 5f03ca9ba28..3ab199625a4 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -94,19 +94,20 @@ void IMB_exit(void);
  *
  * @attention Defined in readimage.c
  */
-struct ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags);
+struct ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size,
+                                    int flags, const char *descr);
 
 /**
  *
  * @attention Defined in readimage.c
  */
-struct ImBuf *IMB_testiffname(char *naam,int flags);
+struct ImBuf *IMB_testiffname(const char *filepath, int flags);
 
 /**
  *
  * @attention Defined in readimage.c
  */
-struct ImBuf *IMB_loadiffname(const char *naam, int flags);
+struct ImBuf *IMB_loadiffname(const char *filepath, int flags);
 
 /**
  *
@@ -119,7 +120,7 @@ void IMB_freeImBuf(struct ImBuf *ibuf);
  * @attention Defined in allocimbuf.c
  */
 struct ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y,
-						 unsigned char d, unsigned int flags);
+                             unsigned char d, unsigned int flags);
 
 /**
  *
@@ -237,7 +238,7 @@ int IMB_anim_get_fps(struct anim * anim,
 
 /**
  *
- * @attention Defined in anim.c
+ * @attention Defined in anim_movie.c
  */
 struct anim *IMB_open_anim(const char *name, int ib_flags, int streamindex);
 void IMB_close_anim(struct anim *anim);
@@ -245,16 +246,16 @@ void IMB_close_anim(struct anim *anim);
 
 /**
  *
- * @attention Defined in anim.c
+ * @attention Defined in anim_movie.c
  */
 
-int ismovie(const char *name);
+int ismovie(const char *filepath);
 void IMB_anim_set_preseek(struct anim *anim, int preseek);
 int IMB_anim_get_preseek(struct anim *anim);
 
 /**
  *
- * @attention Defined in anim.c
+ * @attention Defined in anim_movie.c
  */
 
 struct ImBuf *IMB_anim_absolute(
@@ -264,14 +265,14 @@ struct ImBuf *IMB_anim_absolute(
 
 /**
  *
- * @attention Defined in anim.c
+ * @attention Defined in anim_movie.c
  * fetches a define previewframe, usually half way into the movie
  */
 struct ImBuf *IMB_anim_previewframe(struct anim *anim);
 
 /**
  *
- * @attention Defined in anim.c
+ * @attention Defined in anim_movie.c
  */
 void IMB_free_anim(struct anim *anim);
 
@@ -419,7 +420,7 @@ struct ImBuf *IMB_loadiffmem(int *mem, int flags);
  * @deprecated Only here for backwards compatibility of the
  * @deprecated plugin system.
  */  
-struct ImBuf *IMB_loadifffile(int file, int flags);
+struct ImBuf *IMB_loadifffile(int file, int flags, const char *descr);
 
 /**
  *
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index 1d82c862dbd..5bbabd84648 100644
--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@@ -165,8 +165,6 @@ void IMB_freeImBuf(ImBuf *ibuf)
 			IMB_freezbuffloatImBuf(ibuf);
 			freeencodedbufferImBuf(ibuf);
 			IMB_metadata_free(ibuf);
-			if (ibuf->dds_data.data != NULL)
-				free(ibuf->dds_data.data);
 			MEM_freeN(ibuf);
 		}
 	}
@@ -448,6 +446,7 @@ ImBuf *IMB_dupImBuf(ImBuf *ibuf1)
 	return(ibuf2);
 }
 
+#if 0 /* remove? - campbell */
 /* support for cache limiting */
 
 static void imbuf_cache_destructor(void *data)
@@ -463,6 +462,7 @@ static void imbuf_cache_destructor(void *data)
 	ibuf->c_handle = NULL;
 }
 
+
 static MEM_CacheLimiterC **get_imbuf_cache_limiter(void)
 {
 	static MEM_CacheLimiterC *c = NULL;
@@ -472,3 +472,4 @@ static MEM_CacheLimiterC **get_imbuf_cache_limiter(void)
 
 	return &c;
 }
+#endif
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index e1592d221fb..3adb9a3791f 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -1,7 +1,4 @@
 /*
- * anim.c
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -113,7 +110,7 @@
 #endif
 #endif
 
-int ismovie(const char *UNUSED(name)) {
+int ismovie(const char *UNUSED(filepath)) {
 	return 0;
 }
 
@@ -372,7 +369,7 @@ static ImBuf * avi_fetchibuf (struct anim *anim, int position) {
 		if (anim->pgf) {
 			lpbi = AVIStreamGetFrame(anim->pgf, position + AVIStreamStart(anim->pavi[anim->firstvideo]));
 			if (lpbi) {
-				ibuf = IMB_ibImageFromMemory((unsigned char *) lpbi, 100, IB_rect);
+				ibuf = IMB_ibImageFromMemory((unsigned char *) lpbi, 100, IB_rect, "<avi_fetchibuf>");
 //Oh brother...
 			}
 		}
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index 794777b21d3..c2f73efa63f 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -43,19 +43,20 @@
 #endif
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_filetype.h"
 
-ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags)
+ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags, const char *descr)
 {
 	ImBuf *ibuf;
 	ImFileType *type;
 
 	if(mem == NULL) {
-		printf("Error in ibImageFromMemory: NULL pointer\n");
+		fprintf(stderr, "%s: NULL pointer\n", __func__);
 		return NULL;
 	}
 
@@ -73,12 +74,12 @@ ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags)
 		}
 	}
 
-	fprintf(stderr, "Unknown fileformat\n");
-	
+	fprintf(stderr, "%s: unknown fileformat (%s)\n", __func__, descr);
+
 	return NULL;
 }
 
-ImBuf *IMB_loadifffile(int file, int flags)
+ImBuf *IMB_loadifffile(int file, int flags, const char *descr)
 {
 	ImBuf *ibuf;
 	unsigned char *mem;
@@ -90,14 +91,14 @@ ImBuf *IMB_loadifffile(int file, int flags)
 
 	mem= mmap(NULL, size, PROT_READ, MAP_SHARED, file, 0);
 	if(mem==(unsigned char*)-1) {
-		fprintf(stderr, "Couldn't get mapping\n");
+		fprintf(stderr, "%s: couldn't get mapping %s\n", __func__, descr);
 		return NULL;
 	}
 
-	ibuf= IMB_ibImageFromMemory(mem, size, flags);
+	ibuf= IMB_ibImageFromMemory(mem, size, flags, descr);
 
 	if(munmap(mem, size))
-		fprintf(stderr, "Couldn't unmap file.\n");
+		fprintf(stderr, "%s: couldn't unmap file %s\n", __func__, descr);
 
 	return ibuf;
 }
@@ -117,24 +118,24 @@ static void imb_cache_filename(char *filename, const char *name, int flags)
 	BLI_strncpy(filename, name, IB_FILENAME_SIZE);
 }
 
-ImBuf *IMB_loadiffname(const char *name, int flags)
+ImBuf *IMB_loadiffname(const char *filepath, int flags)
 {
 	ImBuf *ibuf;
 	int file, a;
-	char filename[IB_FILENAME_SIZE];
+	char filepath_tx[IB_FILENAME_SIZE];
 
-	imb_cache_filename(filename, name, flags);
+	imb_cache_filename(filepath_tx, filepath, flags);
 
-	file = open(filename, O_BINARY|O_RDONLY);
+	file = open(filepath_tx, O_BINARY|O_RDONLY);
 	if(file < 0) return NULL;
 
-	ibuf= IMB_loadifffile(file, flags);
+	ibuf= IMB_loadifffile(file, flags, filepath_tx);
 
 	if(ibuf) {
-		BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
-		BLI_strncpy(ibuf->cachename, filename, sizeof(ibuf->cachename));
+		BLI_strncpy(ibuf->name, filepath, sizeof(ibuf->name));
+		BLI_strncpy(ibuf->cachename, filepath_tx, sizeof(ibuf->cachename));
 		for(a=1; a<ibuf->miptot; a++)
-			BLI_strncpy(ibuf->mipmap[a-1]->cachename, filename, sizeof(ibuf->cachename));
+			BLI_strncpy(ibuf->mipmap[a-1]->cachename, filepath_tx, sizeof(ibuf->cachename));
 		if(flags & IB_fields) IMB_de_interlace(ibuf);
 	}
 
@@ -143,21 +144,22 @@ ImBuf *IMB_loadiffname(const char *name, int flags)
 	return ibuf;
 }
 
-ImBuf *IMB_testiffname(char *name, int flags)
+ImBuf *IMB_testiffname(const char *filepath, int flags)
 {
 	ImBuf *ibuf;
 	int file;
-	char filename[IB_FILENAME_SIZE];
+	char filepath_tx[IB_FILENAME_SIZE];
 
-	imb_cache_filename(filename, name, flags);
+	imb_cache_filename(filepath_tx, filepath, flags);
 
-	file = open(filename,O_BINARY|O_RDONLY);
+	file = open(filepath_tx,O_BINARY|O_RDONLY);
 	if(file < 0) return NULL;
 
-	ibuf=IMB_loadifffile(file, flags|IB_test|IB_multilayer);
+	ibuf=IMB_loadifffile(file, flags|IB_test|IB_multilayer, filepath_tx);
+
 	if(ibuf) {
-		BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
-		BLI_strncpy(ibuf->cachename, filename, sizeof(ibuf->cachename));
+		BLI_strncpy(ibuf->name, filepath, sizeof(ibuf->name));
+		BLI_strncpy(ibuf->cachename, filepath_tx, sizeof(ibuf->cachename));
 	}
 
 	close(file);