From 3ecf433432289b9c1990165f65bdd51aaad2eaa7 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 6 Dec 2005 19:44:58 +0000 Subject: expand tabs Original commit message from CVS: expand tabs --- gst/goom/filters.c | 16 ++++++++-------- gst/goom/filters.h | 40 ++++++++++++++++++++-------------------- gst/goom/goom_tools.h | 20 ++++++++++---------- 3 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gst/goom') diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 16f8f532..f92dbcd7 100644 --- a/gst/goom/filters.c +++ b/gst/goom/filters.c @@ -5,9 +5,9 @@ * -ajout de zoomFilter() * -copie de zoomFilter() en zoomFilterRGB(), gérant les 3 couleurs * -optimisation de sinFilter (utilisant une table de sin) - * -asm - * -optimisation de la procedure de génération du buffer de transformation - * la vitesse est maintenant comprise dans [0..128] au lieu de [0..100] + * -asm + * -optimisation de la procedure de génération du buffer de transformation + * la vitesse est maintenant comprise dans [0..128] au lieu de [0..100] */ /*#define _DEBUG_PIXEL; */ @@ -185,7 +185,7 @@ calculatePXandPY (int x, int y, int *px, int *py) static inline void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c) { -/* buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */ +/* buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */ #ifdef _DEBUG_PIXEL if (x + y * resolx >= resolx * resoly) { fprintf (stderr, "setPixel ERROR : hors du tableau... %i, %i\n", x, y); @@ -245,7 +245,7 @@ getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c) (unsigned char *) (buffer + (x + y * resolx))); c->v = *(unsigned char *) (++tmp8); c->r = *(unsigned char *) (++tmp8); -/* *c = (Color) buffer[x+y*WIDTH] ; */ +/* *c = (Color) buffer[x+y*WIDTH] ; */ #endif } @@ -273,7 +273,7 @@ getPixelRGB_ (Uint * buffer, Uint x, Color * c) c->b = *(unsigned char *) (tmp8 = (unsigned char *) (buffer + x)); c->v = *(unsigned char *) (++tmp8); c->r = *(unsigned char *) (++tmp8); -/* *c = (Color) buffer[x+y*WIDTH] ; */ +/* *c = (Color) buffer[x+y*WIDTH] ; */ #endif } @@ -452,8 +452,8 @@ zoomFilterFastRGB (Uint * pix1, npx10 = (px / sqrtperte); npy10 = (py / sqrtperte); -/* if (npx10 >= prevX) fprintf(stderr,"error npx:%d",npx10); - if (npy10 >= prevY) fprintf(stderr,"error npy:%d",npy10); +/* if (npx10 >= prevX) fprintf(stderr,"error npx:%d",npx10); + if (npy10 >= prevY) fprintf(stderr,"error npy:%d",npy10); */ coefh = px % sqrtperte; coefv = py % sqrtperte; diff --git a/gst/goom/filters.h b/gst/goom/filters.h index 33784c29..dac34dd9 100644 --- a/gst/goom/filters.h +++ b/gst/goom/filters.h @@ -7,16 +7,16 @@ typedef struct { - int vitesse ; - unsigned char pertedec ; - unsigned char sqrtperte ; - int middleX,middleY ; - char reverse ; - char mode ; - /** @since June 2001 */ - int hPlaneEffect ; - int vPlaneEffect ; - char noisify ; + int vitesse ; + unsigned char pertedec ; + unsigned char sqrtperte ; + int middleX,middleY ; + char reverse ; + char mode ; + /** @since June 2001 */ + int hPlaneEffect ; + int vPlaneEffect ; + char noisify ; } ZoomFilterData ; @@ -28,8 +28,8 @@ typedef struct #define WATER_MODE 5 void pointFilter(guint32 *pix1, Color c, - float t1, float t2, float t3, float t4, - guint32 cycle); + float t1, float t2, float t3, float t4, + guint32 cycle); /* filtre de zoom : le contenu de pix1 est copie dans pix2, avec l'effet appliqué @@ -43,9 +43,9 @@ Uint middleY); */ void zoomFilterFastRGB (guint32 *pix1, - guint32 *pix2, - ZoomFilterData *zf, - guint32 resx, guint32 resy); + guint32 *pix2, + ZoomFilterData *zf, + guint32 resx, guint32 resy); /* filtre sin : @@ -58,11 +58,11 @@ void zoomFilterFastRGB (guint32 *pix1, */ /* void sinFilter(Uint *pix1,Uint *pix2, - Uint cycle, - Uint mode, - Uint rate, - char lenght, - Uint speed); + Uint cycle, + Uint mode, + Uint rate, + char lenght, + Uint speed); */ #define SIN_MUL 1 diff --git a/gst/goom/goom_tools.h b/gst/goom/goom_tools.h index e3613825..91f310c2 100644 --- a/gst/goom/goom_tools.h +++ b/gst/goom/goom_tools.h @@ -8,22 +8,22 @@ extern int * rand_tab ; extern unsigned short rand_pos ; #define RAND_INIT(i) \ - srand (i) ;\ - if (!rand_tab)\ - rand_tab = (int *) malloc (NB_RAND * sizeof(int)) ;\ - rand_pos = 1 ;\ - while (rand_pos != 0)\ - rand_tab [rand_pos++] = rand () ; + srand (i) ;\ + if (!rand_tab)\ + rand_tab = (int *) malloc (NB_RAND * sizeof(int)) ;\ + rand_pos = 1 ;\ + while (rand_pos != 0)\ + rand_tab [rand_pos++] = rand () ; #define RAND()\ - (rand_tab[rand_pos = rand_pos + 1]) + (rand_tab[rand_pos = rand_pos + 1]) #define RAND_CLOSE()\ - free (rand_tab);\ - rand_tab = 0; + free (rand_tab);\ + rand_tab = 0; /*#define iRAND(i) ((guint32)((float)i * RAND()/RAND_MAX)) */ #define iRAND(i) (RAND()%i) - + #endif -- cgit