[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58473] trunk/blender/source/blender: Fixes for recent Wlimit stuff, which makes strict gcc freak out

[Sergey Sharybin]

Revision: 58473
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58473
Author:   nazgul
Date:     2013-07-21 14:26:27 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
Fixes for recent Wlimit stuff, which makes strict gcc freak out

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/rigidbody.c
    trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-07-21 11:49:35 UTC (rev 58472)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-07-21 14:26:27 UTC (rev 58473)
@@ -288,18 +288,18 @@
 			for (i = 0; (i < totface) && (mface) && (mvert); i++, mface++) {
 				/* add first triangle - verts 1,2,3 */
 				{
-					MVert *va = (IN_RANGE(mface->v1, 0, totvert)) ? (mvert + mface->v1) : (mvert);
-					MVert *vb = (IN_RANGE(mface->v2, 0, totvert)) ? (mvert + mface->v2) : (mvert);
-					MVert *vc = (IN_RANGE(mface->v3, 0, totvert)) ? (mvert + mface->v3) : (mvert);
+					MVert *va = (mface->v1 < totvert) ? (mvert + mface->v1) : (mvert);
+					MVert *vb = (mface->v2 < totvert) ? (mvert + mface->v2) : (mvert);
+					MVert *vc = (mface->v3 < totvert) ? (mvert + mface->v3) : (mvert);
 
 					RB_trimesh_add_triangle(mdata, va->co, vb->co, vc->co);
 				}
 
 				/* add second triangle if needed - verts 1,3,4 */
 				if (mface->v4) {
-					MVert *va = (IN_RANGE(mface->v1, 0, totvert)) ? (mvert + mface->v1) : (mvert);
-					MVert *vb = (IN_RANGE(mface->v3, 0, totvert)) ? (mvert + mface->v3) : (mvert);
-					MVert *vc = (IN_RANGE(mface->v4, 0, totvert)) ? (mvert + mface->v4) : (mvert);
+					MVert *va = (mface->v1 < totvert) ? (mvert + mface->v1) : (mvert);
+					MVert *vb = (mface->v3 < totvert) ? (mvert + mface->v3) : (mvert);
+					MVert *vc = (mface->v4 < totvert) ? (mvert + mface->v4) : (mvert);
 
 					RB_trimesh_add_triangle(mdata, va->co, vb->co, vc->co);
 				}

Modified: trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c	2013-07-21 11:49:35 UTC (rev 58472)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c	2013-07-21 14:26:27 UTC (rev 58473)
@@ -50,7 +50,7 @@
 		}
 		else if (origin == SEEK_CUR) {
 			uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer;
-			if (pos + offset > logFile->memBufferSize || pos < 0)
+			if (pos + offset > logFile->memBufferSize)
 				return 1;
 
 			logFile->memCursor += offset;