[Gridflow-cvs] [svn] commit: r4005 - in /trunk/format: aalib.c jpeg.c main.c netpbm.c opengl.c png.c quicktimehw.c sdl.c videodev.c x11.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Thu Jul 10 12:11:33 EDT 2008


Author: matju
Date: Thu Jul 10 12:11:32 2008
New Revision: 4005

Log:
GRID_INLET doesn't take classname arg anymore

Modified:
    trunk/format/aalib.c
    trunk/format/jpeg.c
    trunk/format/main.c
    trunk/format/netpbm.c
    trunk/format/opengl.c
    trunk/format/png.c
    trunk/format/quicktimehw.c
    trunk/format/sdl.c
    trunk/format/videodev.c
    trunk/format/x11.c

Modified: trunk/format/aalib.c
==============================================================================
--- trunk/format/aalib.c (original)
+++ trunk/format/aalib.c Thu Jul 10 12:11:32 2008
@@ -67,7 +67,7 @@
 	\grin 0 int
 };
 
-GRID_INLET(FormatAALib,0) {
+GRID_INLET(0) {
 	if (!context) RAISE("boo");
 	if (in->dim->n != 3)
 		RAISE("expecting 3 dimensions: rows,columns,channels");

Modified: trunk/format/jpeg.c
==============================================================================
--- trunk/format/jpeg.c (original)
+++ trunk/format/jpeg.c Thu Jul 10 12:11:32 2008
@@ -48,11 +48,9 @@
 	\grin 0 int
 };
 
-GRID_INLET(FormatJPEG,0) {
-	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->get(2));
+GRID_INLET(0) {
+	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->get(2));
 	in->set_chunk(1);
 	cjpeg.err = jpeg_std_error(&jerr);
 	jpeg_create_compress(&cjpeg);
@@ -67,7 +65,7 @@
 	int rowsize = in->dim->get(1)*in->dim->get(2);
 	int rowsize2 = in->dim->get(1)*3;
 	uint8 row[rowsize2];
-	uint8 *rows[1] = { row };
+	uint8 *rows[1] = {row};
 	while (n) {
 		bit_packing->pack(in->dim->get(1),data,row);
 		jpeg_write_scanlines(&cjpeg,rows,1);

Modified: trunk/format/main.c
==============================================================================
--- trunk/format/main.c (original)
+++ trunk/format/main.c Thu Jul 10 12:11:32 2008
@@ -199,7 +199,7 @@
 	SUPER;
 }
 
-GRID_INLET(FormatGrid,0) {
+GRID_INLET(0) {
 	if (!headerless_dim) {
 		fwrite(&head,1,8,f);
 		fwrite(in->dim->v,in->dim->n,4,f); // forgot the endian here

Modified: trunk/format/netpbm.c
==============================================================================
--- trunk/format/netpbm.c (original)
+++ trunk/format/netpbm.c Thu Jul 10 12:11:32 2008
@@ -54,7 +54,7 @@
 	}
 	pnm_freepamrow(tuplerow);
 }
-GRID_INLET(FormatNetPBM,0) {
+GRID_INLET(0) {
 	if (in->dim->n!=3) RAISE("need 3 dimensions");
 	if (in->dim->v[2]!=3) RAISE("need 3 channels");
 	outpam.size = sizeof(struct pam);

Modified: trunk/format/opengl.c
==============================================================================
--- trunk/format/opengl.c (original)
+++ trunk/format/opengl.c Thu Jul 10 12:11:32 2008
@@ -149,7 +149,7 @@
 
 }
 
-GRID_INLET(FormatOpenGL,0) {
+GRID_INLET(0) {
 	if (in->dim->n != 3)
 		RAISE("expecting 3 dimensions: rows,columns,channels");
 	if (in->dim->get(2) != 3)

Modified: trunk/format/png.c
==============================================================================
--- trunk/format/png.c (original)
+++ trunk/format/png.c Thu Jul 10 12:11:32 2008
@@ -42,11 +42,9 @@
 	\grin 0 int
 };
 
-GRID_INLET(FormatPNG,0) {
-	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->get(2));
+GRID_INLET(0) {
+	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->get(2));
 	in->set_chunk(1);
 	RAISE("bother, said pooh, as the PNG encoding was found unimplemented");
 } GRID_FLOW {

Modified: trunk/format/quicktimehw.c
==============================================================================
--- trunk/format/quicktimehw.c (original)
+++ trunk/format/quicktimehw.c Thu Jul 10 12:11:32 2008
@@ -142,7 +142,7 @@
 	quicktime_set_cmodel(anim,colorspace);
 }
 
-GRID_INLET(FormatQuickTimeHW,0) {
+GRID_INLET(0) {
 	if (in->dim->n != 3)           RAISE("expecting 3 dimensions: rows,columns,channels");
 	if (in->dim->get(2)!=channels) RAISE("expecting %d channels (got %d)",channels,in->dim->get(2));
 	in->set_chunk(0);

Modified: trunk/format/sdl.c
==============================================================================
--- trunk/format/sdl.c (original)
+++ trunk/format/sdl.c Thu Jul 10 12:11:32 2008
@@ -175,7 +175,7 @@
 		RAISE("Can't switch to (%d,%d,%dbpp): %s", sy,sx,24, SDL_GetError());
 }
 
-GRID_INLET(FormatSDL,0) {
+GRID_INLET(0) {
 	if (in->dim->n != 3)
 		RAISE("expecting 3 dimensions: rows,columns,channels");
 	if (in->dim->get(2) != 3)

Modified: trunk/format/videodev.c
==============================================================================
--- trunk/format/videodev.c (original)
+++ trunk/format/videodev.c Thu Jul 10 12:11:32 2008
@@ -512,7 +512,7 @@
 	frame_ask();
 }
 
-GRID_INLET(FormatVideoDev,0) {
+GRID_INLET(0) {
 	RAISE("can't write.");
 } GRID_FLOW {
 } GRID_FINISH {

Modified: trunk/format/x11.c
==============================================================================
--- trunk/format/x11.c (original)
+++ trunk/format/x11.c Thu Jul 10 12:11:32 2008
@@ -493,7 +493,7 @@
 	XSync(display,0);
 }
 
-GRID_INLET(FormatX11,0) {
+GRID_INLET(0) {
 	if (in->dim->n != 3)
 		RAISE("expecting 3 dimensions: rows,columns,channels");
 	if (in->dim->get(2)!=3 && in->dim->get(2)!=4)



More information about the Gridflow-cvs mailing list