Validate input chroma in gradient filter (the current code only supports

[vlc] / modules / video_filter / sharpen.c

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 753bf40621fb00b4e40d0d70db9dff3d7dfd3556..8447e2b5d7b6818698ab39608cd2d834e343ca70 100644 (file)
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -2,7 +2,7 @@
  * sharpen.c: Sharpen video filter
  *****************************************************************************
  * Copyright (C) 2003-2007 the VideoLAN team
- * $Id: sharpen.c 18062 2006-11-26 14:20:34Z zorglub $
+ * $Id$
  *
  * Author: Jérémy DEMEULE <dj_mulder at djduron dot no-ip dot org>
  *         Jean-Baptiste Kempf <jb at videolan dot org>
@@ -33,7 +33,12 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
@@ -57,18 +62,18 @@ static int SharpenCallback( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Augment contrast between contours.") );
-    set_shortname( _("Sharpen video filter") );
+    set_description( N_("Augment contrast between contours.") );
+    set_shortname( N_("Sharpen video filter") );
     set_category( CAT_VIDEO );
     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();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "sigma", NULL
 };
 
@@ -225,13 +230,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     }
 
 
-    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;
@@ -250,6 +253,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 ) );