diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-16 09:46:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-16 09:46:10 +0400 |
commit | d1759639dc5a02d2ccde16d1c2fb1e951b15f1ea (patch) | |
tree | f2abdd1bfc9b45818c560e57ed5f6e81b276ae5d /source/blender/imbuf | |
parent | e9683f4b265a7aebb2388ff32779af0aaca50ec4 (diff) |
- remove unused includes IMB_*, BIF_* & MEM_*
- remove MEM_guardedalloc.h from header files (include directly)
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/allocimbuf.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/anim.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cache.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/filter.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/imbuf.h | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/iris.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/png.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/rotate.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/targa.c | 1 |
10 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 8e00c7c7cf1..3f440c0bf6f 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -42,6 +42,7 @@ #include "imbuf.h" #include "MEM_CacheLimiterC-Api.h" +#include "MEM_guardedalloc.h" void imb_freemipmapImBuf(ImBuf *ibuf) { diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index 69e547cd8df..096ed499f85 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -60,6 +60,8 @@ #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail BLI_countlist BLI_stringdec */ +#include "MEM_guardedalloc.h" + #include "DNA_userdef_types.h" #include "BKE_global.h" #include "BKE_depsgraph.h" diff --git a/source/blender/imbuf/intern/cache.c b/source/blender/imbuf/intern/cache.c index d15826df2f0..77e01d8ebef 100644 --- a/source/blender/imbuf/intern/cache.c +++ b/source/blender/imbuf/intern/cache.c @@ -20,6 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include "MEM_guardedalloc.h" + #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_memarena.h" diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index 3ee05da15c9..3cc266e460e 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -30,6 +30,7 @@ */ #include "BKE_utildefines.h" +#include "MEM_guardedalloc.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index 047795355b3..1e2f3ec461a 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -51,8 +51,6 @@ #include <sys/mman.h> #endif -#include "MEM_guardedalloc.h" - #if !defined(WIN32) #define O_BINARY 0 #endif diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index dc9c7a1dc3b..c676c401ccd 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -30,7 +30,10 @@ */ #include <string.h> + #include "BLI_blenlib.h" +#include "MEM_guardedalloc.h" + #include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 4df8d8a2271..6344b227174 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -31,6 +31,7 @@ #include "png.h" #include "BLI_blenlib.h" +#include "MEM_guardedalloc.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index e0e52bb7094..4edb7ac7877 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -30,7 +30,8 @@ */ #include "BLI_blenlib.h" -#include "BKE_utildefines.h" +#include "BKE_utildefines.h" +#include "MEM_guardedalloc.h" #include "imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 335e16402f9..f26eec51b03 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -30,6 +30,7 @@ */ #include "BLI_blenlib.h" +#include "MEM_guardedalloc.h" #include "imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 09aaccc1ab6..b5434b85b5a 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -31,6 +31,7 @@ #include <io.h> #endif #include "BLI_blenlib.h" +#include "MEM_guardedalloc.h" #include "imbuf.h" |