[Gridflow-cvs] [svn] commit: r5612 - in /trunk/src: fftw.cxx quicktimeapple.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed May 5 22:50:04 EDT 2010


Author: matju
Date: Wed May  5 22:50:03 2010
New Revision: 5612

Log:
Dim,GridInlet&

Modified:
    trunk/src/fftw.cxx
    trunk/src/quicktimeapple.cxx

Modified: trunk/src/fftw.cxx
==============================================================================
--- trunk/src/fftw.cxx (original)
+++ trunk/src/fftw.cxx Wed May  5 22:50:03 2010
@@ -68,8 +68,8 @@
 	GridOutlet out(this,0,dim,in.nt);
 	float32 *tada = (float32 *)memalign(16,dim.prod()*sizeof(float32));
 	long chans = in.dim.n>=3 ? in.dim[2] : 1;
-	CHECK_ALIGN16(data,in->nt)
-	CHECK_ALIGN16(tada,in->nt)
+	CHECK_ALIGN16(data,in.nt)
+	CHECK_ALIGN16(tada,in.nt)
 	if (plan && haslastdim && lastdim != in.dim && chans!=lastchans && real==lastreal) {fftwf_destroy_plan(plan); plan=0;}
 	int v[] = {in.dim[0],in.dim[1],in.dim.n>2?in.dim[2]:1};
 //	if (chans==1) {

Modified: trunk/src/quicktimeapple.cxx
==============================================================================
--- trunk/src/quicktimeapple.cxx (original)
+++ trunk/src/quicktimeapple.cxx Wed May  5 22:50:03 2010
@@ -183,11 +183,9 @@
 GRID_INLET(0) {
 	RAISE("Unimplemented. Sorry.");
 //!@#$
-	if (in.dim.n != 3)
-		RAISE("expecting 3 dimensions: rows,columns,channels");
-	if (in.dim.get(2) != 3)
-		RAISE("expecting 3 channels (got %d)",in.dim[2]);
-	in->set_chunk(0);
+	if (in.dim.n  != 3) RAISE("expecting 3 dimensions: rows,columns,channels");
+	if (in.dim[2] != 3) RAISE("expecting 3 channels (got %d)",in.dim[2]);
+	in.set_chunk(0);
 } GRID_FLOW {
 } GRID_FINISH {
 } GRID_END



More information about the Gridflow-cvs mailing list