Use vlc_memset/vlc_memcpy

[vlc] / modules / video_filter / sharpen.c

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index ab58c058bc069e67fa76dd8c481698a470a7862d..362019be7329bac4e90d8c0a9cc272aa859d4cd0 100644 (file)
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * sharpen.c: Sharpen video filter
  *****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
- * $Id: sharpen.c 18062 2006-11-26 14:20:34Z zorglub $
+ * Copyright (C) 2003-2007 the VideoLAN team
+ * $Id$
  *
  * Author: Jérémy DEMEULE <dj_mulder at djduron dot no-ip dot org>
  *         Jean-Baptiste Kempf <jb at videolan dot org>
@@ -32,8 +32,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
@@ -65,7 +67,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
     add_float_with_range( "sharpen-sigma", 0.05, 0.0, 2.0, NULL,
-        SIG_TEXT, SIG_LONGTEXT, VLC_FALSE );
+        SIG_TEXT, SIG_LONGTEXT, false );
     add_shortcut( "sharpen" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -98,7 +100,7 @@ inline static int32_t clip( int32_t a )
 static void init_precalc_table(filter_sys_t *p_filter)
 {
     float sigma = p_filter->f_sigma;
-    
+ 
     for(int i = 0; i < 512; ++i)
     {
         p_filter->tab_precalc[i] = (i - 256) * sigma;
@@ -220,20 +222,18 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
                   (p_src[(i + 1) * i_src_pitch + j    ] * v1) +
                   (p_src[(i + 1) * i_src_pitch + j + 1] * v1);
 
-           pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
-           p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] + 
-                       p_filter->p_sys->tab_precalc[pix + 256] );
+        pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
+        p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] +
+            p_filter->p_sys->tab_precalc[pix + 256] );
         }
     }
 
 
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
-            p_pic->p[U_PLANE].p_pixels,
-            p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
+    vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_pic->p[U_PLANE].p_pixels,
+                p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
 
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
-            p_pic->p[V_PLANE].p_pixels,
-            p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
+    vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_pic->p[V_PLANE].p_pixels,
+                p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
 
 
     p_outpic->date = p_pic->date;
@@ -252,6 +252,7 @@ static int SharpenCallback( vlc_object_t *p_this, char const *psz_var,
                             vlc_value_t oldval, vlc_value_t newval,
                             void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
     if( !strcmp( psz_var, FILTER_PREFIX "sigma" ) )
         p_sys->f_sigma = __MIN( 2., __MAX( 0., newval.f_float ) );