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:
authorCampbell Barton <ideasman42@gmail.com>2011-10-27 08:24:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-27 08:24:34 +0400
commitfa6e6e7fc0977248e7ac10dddc79499304f05bda (patch)
tree6edd348b5b6654b1939aa9f9da23e52014931e0b /source/blender/imbuf/intern/allocimbuf.c
parent31d401613da287d4b867727a5f51f3746edfd334 (diff)
pass image description to image loading functions for more useful error than 'Unknown fileformat'.
Diffstat (limited to 'source/blender/imbuf/intern/allocimbuf.c')
-rw-r--r--source/blender/imbuf/intern/allocimbuf.c5
1 files changed, 3 insertions, 2 deletions
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