summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesús Corrius <jesus@softcatala.org>2008-04-25 12:52:44 +0000
committerTim-Philipp Müller <tim@centricular.net>2008-04-25 12:52:44 +0000
commit883d93df58691c941822e2ca9077a7c23fb74492 (patch)
tree43f5a8eb32aeea836d77bf40383c6af702d7b59a
parentbd8c40c014a19e877efcb4feea1da52015769b89 (diff)
gst/goom/: Fix build with mingw32: use rand() instead of random() and replace bzero() with memset(). Fixes #529692.
Original commit message from CVS: Patch by: Jesús Corrius <jesus at softcatala org> * gst/goom/filters.c: (zoomVector): * gst/goom/goom_core.c: (init_buffers): Fix build with mingw32: use rand() instead of random() and replace bzero() with memset(). Fixes #529692.
-rw-r--r--ChangeLog9
-rw-r--r--gst/goom/filters.c4
-rw-r--r--gst/goom/goom_core.c6
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f478dbf..d7b1d4f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-25 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Jesús Corrius <jesus at softcatala org>
+
+ * gst/goom/filters.c: (zoomVector):
+ * gst/goom/goom_core.c: (init_buffers):
+ Fix build with mingw32: use rand() instead of random() and
+ replace bzero() with memset(). Fixes #529692.
+
2008-04-25 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/avi/gstavidemux.c: (gst_avi_demux_combine_flows):
diff --git a/gst/goom/filters.c b/gst/goom/filters.c
index 3014c352..9bb97c94 100644
--- a/gst/goom/filters.c
+++ b/gst/goom/filters.c
@@ -214,8 +214,8 @@ zoomVector (ZoomFilterFXWrapperData * data, float X, float Y)
/* 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 */
diff --git a/gst/goom/goom_core.c b/gst/goom/goom_core.c
index 5bc64b6d..0e5410e0 100644
--- a/gst/goom/goom_core.c
+++ b/gst/goom/goom_core.c
@@ -38,11 +38,11 @@ static void
init_buffers (PluginInfo * goomInfo, int buffsize)
{
goomInfo->pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->pixel, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->pixel, 0, buffsize * sizeof (guint32) + 128);
goomInfo->back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->back, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->back, 0, buffsize * sizeof (guint32) + 128);
goomInfo->conv = (Pixel *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->conv, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->conv, 0, buffsize * sizeof (guint32) + 128);
goomInfo->outputBuf = goomInfo->conv;