[Bf-blender-cvs] [1af726a] master: Mask: fix for intel openmp which doesn't support casts in for loops

Campbell Barton noreply at git.blender.org
Mon Feb 17 11:38:12 CET 2014


Commit: 1af726a82ef1e302110b296fd0c59c67456e32d6
Author: Campbell Barton
Date:   Mon Feb 17 21:36:47 2014 +1100
https://developer.blender.org/rB1af726a82ef1e302110b296fd0c59c67456e32d6

Mask: fix for intel openmp which doesn't support casts in for loops

===================================================================

M	source/blender/blenkernel/intern/mask_rasterize.c

===================================================================

diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index ba1b873..90bda88 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -1435,12 +1435,16 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle,
 {
 #ifdef _MSC_VER
 	int y;  /* msvc requires signed for some reason */
+
+	/* ignore sign mismatch */
+#  pragma warning(push)
+#  pragma warning(disable:4018)
 #else
 	unsigned int y;
 #endif
 
 #pragma omp parallel for private(y)
-	for (y = 0; (unsigned int)y < height; y++) {
+	for (y = 0; y < height; y++) {
 		unsigned int i = y * width;
 		unsigned int x;
 		float xy[2];
@@ -1451,4 +1455,9 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle,
 			buffer[i] = BKE_maskrasterize_handle_sample(mr_handle, xy);
 		}
 	}
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+
 }




More information about the Bf-blender-cvs mailing list