Mostly revert [25311], [25313].

[vlc] / modules / video_filter / sharpen.c

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 2d78cadde83713ccf15d16f34c46846e5fed793f..8dc84eb8b428d09738fbad42df79b3f0b30d3b81 100644 (file)
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -32,7 +32,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
@@ -97,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;
@@ -219,9 +222,9 @@ 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] );
         }
     }
 
@@ -251,6 +254,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 ) );