[xine-cvs] CVS: xine-lib/src/post/goom Makefile.am,1.21,1.21.2.1 diff_against_release.patch,1.1.2.1,1.1.2.2 filters.c,1.16.2.1,1.16.2.2

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/post/goom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26982/src/post/goom

Modified Files:
      Tag: xine-1_0
	Makefile.am diff_against_release.patch filters.c 
Log Message:
collected fixes from CVS HEAD for the stable branch


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- Makefile.am	21 Nov 2004 15:10:40 -0000	1.21
+++ Makefile.am	9 Oct 2005 16:54:42 -0000	1.21.2.1
@@ -25,7 +25,7 @@
 	gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c \
 	goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c mathtools.c \
 	plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
-xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS)
+xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS)
 xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
 
 noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \

Index: diff_against_release.patch
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/diff_against_release.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- diff_against_release.patch	17 Jul 2005 21:50:05 -0000	1.1.2.1
+++ diff_against_release.patch	9 Oct 2005 16:54:42 -0000	1.1.2.2
@@ -24,6 +24,17 @@
  /*	FVAL(data->factor_p) = data->factor / MAX;*/
 --- filters.c	2004-09-10 17:10:39.000000000 +0200
 +++ filters.c	2004-11-21 15:37:55.000000000 +0100
+@@ -201,8 +201,8 @@
+     /* Noise */
+     if (data->noisify)
+     {
+-        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+-        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
++        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
++        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+     }
+     
+     /* Hypercos */
 @@ -705,7 +705,7 @@
      
      data->general_speed = 0.0f;

Index: filters.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/filters.c,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- filters.c	17 Jul 2005 21:50:06 -0000	1.16.2.1
+++ filters.c	9 Oct 2005 16:54:42 -0000	1.16.2.2
@@ -201,8 +201,8 @@
     /* Noise */
     if (data->noisify)
     {
-        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
-        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
     }
     
     /* Hypercos */