Revision: 45433
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45433
Author: campbellbarton
Date: 2012-04-06 04:46:47 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
code cleanup: header cleanup, remove commented workaround for mingw since its
no longer needed.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/release/plugins/sequence/color-correction-hsv.c
trunk/blender/release/plugins/sequence/color-correction-yuv.c
trunk/blender/release/plugins/sequence/dnr.c
trunk/blender/release/plugins/sequence/gamma.c
trunk/blender/release/plugins/texture/clouds2.c
trunk/blender/release/plugins/texture/tiles.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/imbuf/intern/imageprocess.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2012-04-06 03:37:27 UTC
(rev 45432)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2012-04-06 04:46:47 UTC
(rev 45433)
@@ -319,7 +319,7 @@
#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 @@
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 @@
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);
Modified: trunk/blender/release/plugins/sequence/color-correction-hsv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-hsv.c
2012-04-06 03:37:27 UTC (rev 45432)
+++ trunk/blender/release/plugins/sequence/color-correction-hsv.c
2012-04-06 04:46:47 UTC (rev 45433)
@@ -15,7 +15,7 @@
*
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
#include <stdio.h>
Modified: trunk/blender/release/plugins/sequence/color-correction-yuv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-yuv.c
2012-04-06 03:37:27 UTC (rev 45432)
+++ trunk/blender/release/plugins/sequence/color-correction-yuv.c
2012-04-06 04:46:47 UTC (rev 45433)
@@ -15,7 +15,7 @@
*
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
#include <stdio.h>
Modified: trunk/blender/release/plugins/sequence/dnr.c
===================================================================
--- trunk/blender/release/plugins/sequence/dnr.c 2012-04-06 03:37:27 UTC
(rev 45432)
+++ trunk/blender/release/plugins/sequence/dnr.c 2012-04-06 04:46:47 UTC
(rev 45433)
@@ -15,7 +15,7 @@
*
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
#include <stdio.h>
Modified: trunk/blender/release/plugins/sequence/gamma.c
===================================================================
--- trunk/blender/release/plugins/sequence/gamma.c 2012-04-06 03:37:27 UTC
(rev 45432)
+++ trunk/blender/release/plugins/sequence/gamma.c 2012-04-06 04:46:47 UTC
(rev 45433)
@@ -15,7 +15,7 @@
*
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
#include "util.h"
#include <stdio.h>
Modified: trunk/blender/release/plugins/texture/clouds2.c
===================================================================
--- trunk/blender/release/plugins/texture/clouds2.c 2012-04-06 03:37:27 UTC
(rev 45432)
+++ trunk/blender/release/plugins/texture/clouds2.c 2012-04-06 04:46:47 UTC
(rev 45433)
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
/* ******************** GLOBAL VARIABLES ***************** */
Modified: trunk/blender/release/plugins/texture/tiles.c
===================================================================
--- trunk/blender/release/plugins/texture/tiles.c 2012-04-06 03:37:27 UTC
(rev 45432)
+++ trunk/blender/release/plugins/texture/tiles.c 2012-04-06 04:46:47 UTC
(rev 45433)
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#include "math.h"
+#include <math.h>
#include "plugin.h"
/* ******************** GLOBAL VARIABLES ***************** */
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-04-06
03:37:27 UTC (rev 45432)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-04-06
04:46:47 UTC (rev 45433)
@@ -32,7 +32,7 @@
#include <string.h>
#include <math.h>
-#include "ctype.h"
+#include <ctype.h>
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/imbuf/intern/imageprocess.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/imageprocess.c 2012-04-06
03:37:27 UTC (rev 45432)
+++ trunk/blender/source/blender/imbuf/intern/imageprocess.c 2012-04-06
04:46:47 UTC (rev 45433)
@@ -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 */
Modified: trunk/blender/source/blender/render/intern/source/sunsky.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/sunsky.c 2012-04-06
03:37:27 UTC (rev 45432)
+++ trunk/blender/source/blender/render/intern/source/sunsky.c 2012-04-06
04:46:47 UTC (rev 45433)
@@ -26,10 +26,7 @@
* http://www.cs.utah.edu/vissim/papers/sunsky/code/
*/
-
-
#include "sunsky.h"
-#include "math.h"
#include "BLI_math.h"
#include "BKE_global.h"
Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2012-04-06
03:37:27 UTC (rev 45432)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2012-04-06
04:46:47 UTC (rev 45433)
@@ -28,30 +28,26 @@
#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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
