[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42680] trunk/blender/source/blender: Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).

[Brecht Van Lommel]

Revision: 42680
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42680
Author:   blendix
Date:     2011-12-17 01:13:02 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/editors/space_outliner/outliner_select.c
    trunk/blender/source/blender/imbuf/intern/anim_movie.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2011-12-17 00:52:36 UTC (rev 42679)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2011-12-17 01:13:02 UTC (rev 42680)
@@ -1508,10 +1508,7 @@
 
 	int ok;
 
-	if(imtype == -1) {
-		/* use whatever existing image type is set by 'ibuf' */
-	}
-	else if(imtype== R_IMF_IMTYPE_IRIS) {
+	if(imtype== R_IMF_IMTYPE_IRIS) {
 		ibuf->ftype= IMAGIC;
 	}
 #ifdef WITH_HDR

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2011-12-17 00:52:36 UTC (rev 42679)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2011-12-17 01:13:02 UTC (rev 42680)
@@ -2599,8 +2599,8 @@
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	int nr= RNA_enum_get(op->ptr, "group");
 
+	BLI_assert(nr+1 >= 0);
 	ob->actdef= nr+1;
-	BLI_assert(ob->actdef >= 0);
 
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob);
@@ -2733,8 +2733,8 @@
 	sort_map_update[0]= 0;
 	vgroup_remap_update_users(ob, sort_map_update);
 
+	BLI_assert(sort_map_update[ob->actdef] >= 0);
 	ob->actdef= sort_map_update[ob->actdef];
-	BLI_assert(ob->actdef >= 0);
 	
 	MEM_freeN(sort_map_update);
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2011-12-17 00:52:36 UTC (rev 42679)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2011-12-17 01:13:02 UTC (rev 42680)
@@ -1023,8 +1023,8 @@
 	ViewContext vc;
 	view3d_set_viewcontext(C, &vc);
 
+	BLI_assert(type + 1 >= 0);
 	vc.obact->actdef= type + 1;
-	BLI_assert(vc.obact->actdef >= 0);
 
 	DAG_id_tag_update(&vc.obact->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, vc.obact);
@@ -1918,8 +1918,9 @@
 						dg= ED_vgroup_add_name(ob, pchan->name);	/* sets actdef */
 					}
 					else {
-						ob->actdef= 1 + BLI_findindex(&ob->defbase, dg);
-						BLI_assert(ob->actdef >= 0);
+						int actdef = 1 + BLI_findindex(&ob->defbase, dg);
+						BLI_assert(actdef >= 0);
+						ob->actdef= actdef;
 					}
 				}
 			}

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_select.c	2011-12-17 00:52:36 UTC (rev 42679)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_select.c	2011-12-17 01:13:02 UTC (rev 42680)
@@ -396,8 +396,8 @@
 	/* id in tselem is object */
 	ob= (Object *)tselem->id;
 	if(set) {
+		BLI_assert(te->index+1 >= 0);
 		ob->actdef= te->index+1;
-		BLI_assert(ob->actdef >= 0);
 
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);

Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-12-17 00:52:36 UTC (rev 42679)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-12-17 01:13:02 UTC (rev 42680)
@@ -703,7 +703,6 @@
 		int dstStride2[4] = { -dstStride[0], 0, 0, 0 };
 		uint8_t* dst2[4]  = { dst[0] + (anim->y - 1)*dstStride[0],
 				      0, 0, 0 };
-		int i;
 		
 		sws_scale(anim->img_convert_ctx,
 		          (const uint8_t * const *)input->data,