[Gridflow-cvs] [svn] commit: r3977 - in /trunk: gridflow.c optional/opencv.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Jul 4 16:15:08 EDT 2008


Author: matju
Date: Fri Jul  4 16:15:08 2008
New Revision: 3977

Log:
fix warnings about && (Claude)

Modified:
    trunk/gridflow.c
    trunk/optional/opencv.c

Modified: trunk/gridflow.c
==============================================================================
--- trunk/gridflow.c (original)
+++ trunk/gridflow.c Fri Jul  4 16:15:08 2008
@@ -754,7 +754,7 @@
 			while (se>s && se[-1]==')') {se--; close++;}
 			if (s!=se) {
 				binbuf_text(buf,(char *)s,se-s);
-				if (binbuf_getnatom(buf)==1 && binbuf_getvec(buf)[0].a_type==A_FLOAT || binbuf_getvec(buf)[0].a_type==A_COMMA) {
+				if ((binbuf_getnatom(buf)==1 && binbuf_getvec(buf)[0].a_type==A_FLOAT) || binbuf_getvec(buf)[0].a_type==A_COMMA) {
 					av[j++] = binbuf_getvec(buf)[0];
 				} else {
 					char ss[MAXPDSTRING];

Modified: trunk/optional/opencv.c
==============================================================================
--- trunk/optional/opencv.c (original)
+++ trunk/optional/opencv.c Fri Jul  4 16:15:08 2008
@@ -96,7 +96,7 @@
 	int dims=g->dim->n;
 	//post("mode=%d",(int)mode);
 	if (mode==cv_mode_channels && g->dim->n==0) RAISE("CV: channels dimension required for 'mode channels'");
-	if (mode==cv_mode_auto && g->dim->n>=3 || mode==cv_mode_channels) channels=g->dim->v[--dims];
+	if ((mode==cv_mode_auto && g->dim->n>=3) || mode==cv_mode_channels) channels=g->dim->v[--dims];
 	if (channels>64) RAISE("CV: too many channels. max 64, got %d",channels);
 	//post("channels=%d dims=%d nt=%d",channels,dims,g->nt);
 	//post("bits=%d",number_type_table[g->nt].size);



More information about the Gridflow-cvs mailing list