code cleanup: header cleanup, remove commented workaround for mingw since its no...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Apr 2012 04:46:47 +0000 (04:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Apr 2012 04:46:47 +0000 (04:46 +0000)
intern/guardedalloc/intern/mallocn.c
release/plugins/sequence/color-correction-hsv.c
release/plugins/sequence/color-correction-yuv.c
release/plugins/sequence/dnr.c
release/plugins/sequence/gamma.c
release/plugins/texture/clouds2.c
release/plugins/texture/tiles.c
source/blender/blenkernel/intern/deform.c
source/blender/imbuf/intern/imageprocess.c
source/blender/render/intern/source/sunsky.c
source/gameengine/VideoTexture/VideoFFmpeg.h

index 97ac3008072131f45d20b052011e7f762a38c9d5..2a6a0df0ff407a44df16df77cdb79212770b8a9a 100644 (file)
@@ -319,7 +319,7 @@ void *MEM_mallocN(size_t len, const char *str)
 
 #ifdef DEBUG_MEMCOUNTER
                if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
-                       memcount_raise("MEM_mallocN");
+                       memcount_raise(__func__);
                memh->_count= _mallocn_count++;
 #endif
                return (++memh);
@@ -344,7 +344,7 @@ void *MEM_callocN(size_t len, const char *str)
                mem_unlock_thread();
 #ifdef DEBUG_MEMCOUNTER
                if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
-                       memcount_raise("MEM_callocN");
+                       memcount_raise(__func__);
                memh->_count= _mallocn_count++;
 #endif
                return (++memh);
@@ -374,7 +374,7 @@ void *MEM_mapallocN(size_t len, const char *str)
                mem_unlock_thread();
 #ifdef DEBUG_MEMCOUNTER
                if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
-                       memcount_raise("MEM_mapallocN");
+                       memcount_raise(__func__);
                memh->_count= _mallocn_count++;
 #endif
                return (++memh);
index 1dcf0096efa43f3e5e0ad7c6f2d926c6b70776bd..b9ffd88b26c8f217ddd1d556c57a40a529fa140b 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
index cc6c6198431353ddaec96c138ef3671b453f625f..c0c5d048b8f6dc2dc39b76c28d578a2476f498de 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
index ab47361ea73a65878e38810b62a84605dc59b8b0..9c42098c248ef38144bda4e1087b164a2fe6346f 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
index 596c98646f3e2e976970db8b8ae7c9cdc5e52dca..d6181eb0e9def0dfd8935239d7c96ac675309911 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include "util.h"
 #include <stdio.h>
index 454e8e282067235020c849e92649e2255f53fb39..fc20f5769ef6c973c6747d2badd80df318aa9af5 100644 (file)
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
  
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 
 /* ******************** GLOBAL VARIABLES ***************** */
index c7af6e58fa4a315ebcf860ba753a206d079a86d6..151f64b6dabeeb1c336d3c31789c729727bdce34 100644 (file)
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 
 /* ******************** GLOBAL VARIABLES ***************** */
index c41f5b6f86f7c8f3e277359615f1ffc8b500f263..1232177fa1037a66c1af09961c609a42a87c67f8 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <string.h>
 #include <math.h>
-#include "ctype.h"
+#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 
index 1976242ea4f6bc69fc492bec26fc8db7061ac6a1..ba165d51e968e5b241d01c58d36f086c5e2f0aee 100644 (file)
@@ -46,7 +46,7 @@
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "math.h"
+#include <math.h>
 
 /* This define should be relocated to a global header some where  Kent Mein 
  * I stole it from util.h in the plugins api */
index 00370fb51bf870045eb9361a5410bebc3adc196c..8097628e5753ba47e4fcd39a27b8fefc7d161acc 100644 (file)
  * http://www.cs.utah.edu/vissim/papers/sunsky/code/
  */
 
-
-
 #include "sunsky.h"
-#include "math.h"
 #include "BLI_math.h"
 #include "BKE_global.h"
 
index ee4354e256e5f444af8f15cb5bcbf3bdf27c0c8c..d3458211949549d87b1811b56ae4e5f1d9fbc710 100644 (file)
@@ -28,30 +28,26 @@ http://www.gnu.org/copyleft/lesser.txt.
 #define __VIDEOFFMPEG_H__
 
 #ifdef WITH_FFMPEG
-#if defined(__FreeBSD__)
 /* this needs to be parsed with __cplusplus defined before included through ffmpeg_compat.h */
-#include <inttypes.h>
+#if defined(__FreeBSD__)
+#  include <inttypes.h>
 #endif
 extern "C" {
-// #undef __cplusplus // was done for mingw4.4, see r23608
 #include <pthread.h>
-
 #include "ffmpeg_compat.h"
-
 #include "DNA_listBase.h"
 #include "BLI_threads.h"
 #include "BLI_blenlib.h"
-// #define __cplusplus
 }
 
 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
-#define FFMPEG_OLD_FRAME_RATE 1
+#  define FFMPEG_OLD_FRAME_RATE 1
 #else
-#define FFMPEG_CODEC_IS_POINTER 1
+#  define FFMPEG_CODEC_IS_POINTER 1
 #endif
 
 #if LIBAVFORMAT_VERSION_INT >= (52 << 16)
-#define FFMPEG_PB_IS_POINTER 1
+#  define FFMPEG_PB_IS_POINTER 1
 #endif
 
 #ifdef FFMPEG_CODEC_IS_POINTER