effectv/ripple: remove unnecessary NULL checks before g_free()

This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-11-14 20:01:43 -08:00
parent 1c30fa8350
commit 24e689c57e

View file

@ -460,24 +460,20 @@ gst_rippletv_set_info (GstVideoFilter * vfilter, GstCaps * incaps,
/* we over allocate the buffers, as the render code does not handle clipping /* we over allocate the buffers, as the render code does not handle clipping
* very well */ * very well */
if (filter->map) g_free (filter->map);
g_free (filter->map);
filter->map = g_new0 (gint, (1 + filter->map_h) * filter->map_w * 3); filter->map = g_new0 (gint, (1 + filter->map_h) * filter->map_w * 3);
filter->map1 = filter->map; filter->map1 = filter->map;
filter->map2 = filter->map + filter->map_w * filter->map_h; filter->map2 = filter->map + filter->map_w * filter->map_h;
filter->map3 = filter->map + filter->map_w * filter->map_h * 2; filter->map3 = filter->map + filter->map_w * filter->map_h * 2;
if (filter->vtable) g_free (filter->vtable);
g_free (filter->vtable);
filter->vtable = g_new0 (gint8, (1 + filter->map_h) * filter->map_w * 2); filter->vtable = g_new0 (gint8, (1 + filter->map_h) * filter->map_w * 2);
if (filter->background) g_free (filter->background);
g_free (filter->background);
filter->background = g_new0 (gint16, width * (height + 1)); filter->background = g_new0 (gint16, width * (height + 1));
if (filter->diff) g_free (filter->diff);
g_free (filter->diff);
filter->diff = g_new0 (guint8, width * (height + 1)); filter->diff = g_new0 (guint8, width * (height + 1));
GST_OBJECT_UNLOCK (filter); GST_OBJECT_UNLOCK (filter);
@ -507,20 +503,16 @@ gst_rippletv_finalize (GObject * object)
{ {
GstRippleTV *filter = GST_RIPPLETV (object); GstRippleTV *filter = GST_RIPPLETV (object);
if (filter->map) g_free (filter->map);
g_free (filter->map);
filter->map = NULL; filter->map = NULL;
if (filter->vtable) g_free (filter->vtable);
g_free (filter->vtable);
filter->vtable = NULL; filter->vtable = NULL;
if (filter->background) g_free (filter->background);
g_free (filter->background);
filter->background = NULL; filter->background = NULL;
if (filter->diff) g_free (filter->diff);
g_free (filter->diff);
filter->diff = NULL; filter->diff = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);