[Gridflow-cvs] [svn] commit: r5607 - in /trunk/src: aalib.cxx x11.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed May 5 22:15:46 EDT 2010


Author: matju
Date: Wed May  5 22:15:44 2010
New Revision: 5607

Log:
Dim,GridInlet&

Modified:
    trunk/src/aalib.cxx
    trunk/src/x11.cxx

Modified: trunk/src/aalib.cxx
==============================================================================
--- trunk/src/aalib.cxx (original)
+++ trunk/src/aalib.cxx Wed May  5 22:15:44 2010
@@ -69,17 +69,15 @@
 
 GRID_INLET(0) {
 	if (!context) RAISE("boo");
-	if (in->dim->n != 3)
-		RAISE("expecting 3 dimensions: rows,columns,channels");
-	switch (in->dim->get(2)) {
+	if (in.dim.n!=3) RAISE("expecting 3 dimensions: rows,columns,channels");
+	switch (in.dim[2]) {
 	case 1: raw_mode = false; break;
 	case 2: raw_mode = true; break;
-	default:
-		RAISE("expecting 1 greyscale channel (got %d)",in->dim->get(2));
+	default: RAISE("expecting 1 greyscale channel (got %d)",in.dim[2]);
 	}
-	in->set_chunk(1);
+	in.set_chunk(1);
 } GRID_FLOW {
-	int f = in->dim->prod(1);
+	int f = in.dim.prod(1);
 	if (raw_mode) {
 		int sx = min(f,aa_scrwidth(context));
 		int y = dex/f;

Modified: trunk/src/x11.cxx
==============================================================================
--- trunk/src/x11.cxx (original)
+++ trunk/src/x11.cxx Wed May  5 22:15:44 2010
@@ -601,7 +601,7 @@
 		RAISE("expecting 3 or 4 channels: red,green,blue,ignored (got %d)",in.dim[2]);
 	int sx = in.dim[1], osx = dim[1];
 	int sy = in.dim[0], osy = dim[0];
-	in->set_chunk(1);
+	in.set_chunk(1);
 	if (sx!=osx || sy!=osy) resize_window(sx,sy);
 	if (in.dim[2]!=bit_packing->size) {
 		bit_packing->mask[3]=0;



More information about the Gridflow-cvs mailing list