From 7ade2474711094ba46c7a53fa3bb5f899f2eb05a Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Sat, 7 May 2016 13:26:59 +0200
Subject: [PATCH 1/6] Libvje / refactor : complexinvert

* remove width, height
---
 veejay-current/veejay-server/libvje/effects/complexinvert.c | 4 ++--
 veejay-current/veejay-server/libvje/effects/complexinvert.h | 5 ++---
 veejay-current/veejay-server/libvje/internal.h              | 5 ++---
 veejay-current/veejay-server/libvje/vj-effman.c             | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/complexinvert.c b/veejay-current/veejay-server/libvje/effects/complexinvert.c
index beca1c33..8b6d57c7 100644
--- a/veejay-current/veejay-server/libvje/effects/complexinvert.c
+++ b/veejay-current/veejay-server/libvje/effects/complexinvert.c
@@ -63,8 +63,8 @@ vj_effect *complexinvert_init(int w, int h)
     return ve;
 }
 
-void complexinvert_apply(VJFrame *frame, int width,
-			int height, int i_angle, int r, int g, int b, int i_noise)
+void complexinvert_apply(VJFrame *frame, int i_angle, int r, int g, int b,
+                         int i_noise)
 {
 	uint8_t *fg_y, *fg_cb, *fg_cr;
     uint8_t *bg_y, *bg_cb, *bg_cr;
diff --git a/veejay-current/veejay-server/libvje/effects/complexinvert.h b/veejay-current/veejay-server/libvje/effects/complexinvert.h
index 37ec4389..5528fa54 100644
--- a/veejay-current/veejay-server/libvje/effects/complexinvert.h
+++ b/veejay-current/veejay-server/libvje/effects/complexinvert.h
@@ -21,7 +21,6 @@
 #ifndef COMPLEXINVERT_H
 #define COMPLEXINVERT_H
 vj_effect *complexinvert_init();
-void complexinvert_apply(VJFrame *frame, int width,
-		  int height, int i_angle, 
-		  int red, int green, int blue, int i_noise);
+void complexinvert_apply(VJFrame *frame, int i_angle, int red, int green, int blue,
+                         int i_noise);
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index 23993145..08698482 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -393,10 +393,9 @@ extern void greyselect_apply(VJFrame *frame, int angle, int r, int g, int b, int
 extern void isolate_apply(VJFrame *frame, int angle, int r, int g, int b, int opacity);
 extern void bwselect_apply(VJFrame *frame, int a , int b, int c, int g);
 extern void bwotsu_apply(VJFrame *frame, int mode, int skew,int invert);
-
 extern void meanfilter_apply(VJFrame *frame);
-
-extern void complexinvert_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b, int i_noise);
+extern void complexinvert_apply(VJFrame *frame, int angle, int r, int g, int b,
+                                int i_noise);
 
 extern void complexsaturation_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b, int adj, int adjv, int inoise);
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index dcf1d125..774fa575 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -139,7 +139,7 @@ static void vj_effman_apply_image_effect(
 	break;
 
      case VJ_IMAGE_EFFECT_COMPLEXINVERT:
-	complexinvert_apply(frames[0], frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4]);
+	complexinvert_apply(frames[0], arg[0], arg[1], arg[2], arg[3], arg[4]);
 	break;
      case VJ_IMAGE_EFFECT_COMPLEXSATURATE:
 	complexsaturation_apply(frames[0], frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);

From e327396770769a1d9e20eb66070f10a67838083d Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Sat, 7 May 2016 13:27:29 +0200
Subject: [PATCH 2/6] Libvje / refactor : complexsaturate

* remove width, height
---
 .../veejay-server/libvje/effects/complexsaturate.c          | 5 ++---
 .../veejay-server/libvje/effects/complexsaturate.h          | 6 +++---
 veejay-current/veejay-server/libvje/internal.h              | 4 ++--
 veejay-current/veejay-server/libvje/vj-effman.c             | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/complexsaturate.c b/veejay-current/veejay-server/libvje/effects/complexsaturate.c
index 5b8b80c9..5903415a 100644
--- a/veejay-current/veejay-server/libvje/effects/complexsaturate.c
+++ b/veejay-current/veejay-server/libvje/effects/complexsaturate.c
@@ -70,9 +70,8 @@ vj_effect *complexsaturation_init(int w, int h)
     return ve;
 }
 
-void complexsaturation_apply(VJFrame *frame, int width,
-		   int height, int i_angle, int r, int g,
-		   int b, int adjust_v, int adjust_degrees, int i_noise)
+void complexsaturation_apply(VJFrame *frame, int i_angle, int r, int g, int b,
+                             int adjust_v, int adjust_degrees, int i_noise)
 {
 //	double degrees = adjust_degrees * 0.01;
 //	double dsat = adjust_v * 0.01;
diff --git a/veejay-current/veejay-server/libvje/effects/complexsaturate.h b/veejay-current/veejay-server/libvje/effects/complexsaturate.h
index f3441cfd..f24ec631 100644
--- a/veejay-current/veejay-server/libvje/effects/complexsaturate.h
+++ b/veejay-current/veejay-server/libvje/effects/complexsaturate.h
@@ -25,8 +25,8 @@
 #include <stdint.h>
 
 vj_effect *complexsaturation_init();
-void complexsaturation_apply(VJFrame *frame, int width,
-		  int height, int i_angle, 
-		  int red, int green, int blue, int adjust_degrees, int adjust_v, int i_noise );
+void complexsaturation_apply(VJFrame *frame, int i_angle,
+                             int red, int green, int blue,
+                             int adjust_degrees, int adjust_v, int i_noise );
 void complexsaturate_free();
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index 08698482..a8fc2d73 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -396,8 +396,8 @@ extern void bwotsu_apply(VJFrame *frame, int mode, int skew,int invert);
 extern void meanfilter_apply(VJFrame *frame);
 extern void complexinvert_apply(VJFrame *frame, int angle, int r, int g, int b,
                                 int i_noise);
-
-extern void complexsaturation_apply(VJFrame *frame, int w, int h, int angle, int r, int g, int b, int adj, int adjv, int inoise);
+extern void complexsaturation_apply(VJFrame *frame, int angle, int r, int g, int b,
+                                    int adj, int adjv, int inoise);
 
 extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int w, int h, int angle, int r, 
 	int g, int b, int level, int threshold);
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 774fa575..834c9ed2 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -142,7 +142,8 @@ static void vj_effman_apply_image_effect(
 	complexinvert_apply(frames[0], arg[0], arg[1], arg[2], arg[3], arg[4]);
 	break;
      case VJ_IMAGE_EFFECT_COMPLEXSATURATE:
-	complexsaturation_apply(frames[0], frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);
+	complexsaturation_apply(frames[0], arg[0], arg[1], arg[2], arg[3],
+	                        arg[4], arg[5], arg[6]);
 	break;
      case VJ_IMAGE_EFFECT_REFLECTION:
 	reflection_apply(frames[0], arg[0], arg[1], arg[2]);

From 8825e22c7bfd1a62850cad09f177a9ca20bd2356 Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Sat, 7 May 2016 13:30:50 +0200
Subject: [PATCH 3/6] Libvje / refactor : complexthreshold

* w = frame->w
---
 .../veejay-server/libvje/effects/complexthreshold.c         | 6 +++---
 .../veejay-server/libvje/effects/complexthreshold.h         | 5 ++---
 veejay-current/veejay-server/libvje/internal.h              | 5 ++---
 veejay-current/veejay-server/libvje/vj-effman.c             | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/complexthreshold.c b/veejay-current/veejay-server/libvje/effects/complexthreshold.c
index d0370532..a923635e 100644
--- a/veejay-current/veejay-server/libvje/effects/complexthreshold.c
+++ b/veejay-current/veejay-server/libvje/effects/complexthreshold.c
@@ -92,9 +92,8 @@ static int accept_tpixel(uint8_t fg_cb, uint8_t fg_cr, int cb, int cr,
     return 0;
 }
 
-void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int width,
-			int height, int i_angle, int r, int g, int b,
-			int level, int threshold)
+void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int i_angle,
+                            int r, int g, int b, int level, int threshold)
 {
 
     uint8_t *fg_y, *fg_cb, *fg_cr;
@@ -110,6 +109,7 @@ void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int width,
     int matrix[5];
     int val, tmp1;
 	const int len = frame->len;
+	const int width = frame->width;
  	uint8_t *Y = frame->data[0];
 	uint8_t *Cb = frame->data[1];
 	uint8_t *Cr = frame->data[2];
diff --git a/veejay-current/veejay-server/libvje/effects/complexthreshold.h b/veejay-current/veejay-server/libvje/effects/complexthreshold.h
index eb4d87b9..2c7d23b5 100644
--- a/veejay-current/veejay-server/libvje/effects/complexthreshold.h
+++ b/veejay-current/veejay-server/libvje/effects/complexthreshold.h
@@ -21,7 +21,6 @@
 #ifndef COMPLEXTHRESHOLD_H
 #define COMPLEXTHRESHOLD_H
 vj_effect *complexthreshold_init();
-void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int width,
-			int height, int i_angle, int red, int green,
-			int blue, int level, int threshold);
+void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int i_angle,
+                            int red, int green, int blue, int level, int threshold);
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index a8fc2d73..d016af2c 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -398,9 +398,8 @@ extern void complexinvert_apply(VJFrame *frame, int angle, int r, int g, int b,
                                 int i_noise);
 extern void complexsaturation_apply(VJFrame *frame, int angle, int r, int g, int b,
                                     int adj, int adjv, int inoise);
-
-extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int w, int h, int angle, int r, 
-	int g, int b, int level, int threshold);
+extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int angle,
+                                   int r, int g, int b, int level, int threshold);
 		
 extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int w, int h, int val );
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 834c9ed2..82cdd73c 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -466,8 +466,8 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in
 		frames[0]->width,frames[0]->height, arg[0],arg[1],arg[2]);
 		break;
       case VJ_VIDEO_EFFECT_COMPLEXTHRESHOLD:
-	complexthreshold_apply(frames[0],frames[1],frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],
-		arg[4], arg[5]);
+	complexthreshold_apply(frames[0], frames[1], arg[0], arg[1], arg[2], arg[3],
+	                       arg[4], arg[5]);
 	break;
       case VJ_VIDEO_EFFECT_DUPMAGIC:
 	dupmagic_apply(frames[0], frames[1], arg[0]);

From 7f86ccdef20341e93013bfc4201444944a0f7e10 Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Sat, 7 May 2016 14:38:43 +0200
Subject: [PATCH 4/6] Libvje / refactor : complexsync

* frame->h , frame->w
---
 veejay-current/veejay-server/libvje/effects/complexsync.c | 3 ++-
 veejay-current/veejay-server/libvje/effects/complexsync.h | 2 +-
 veejay-current/veejay-server/libvje/internal.h            | 3 +--
 veejay-current/veejay-server/libvje/vj-effman.c           | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/complexsync.c b/veejay-current/veejay-server/libvje/effects/complexsync.c
index bcef32b8..931bc07b 100644
--- a/veejay-current/veejay-server/libvje/effects/complexsync.c
+++ b/veejay-current/veejay-server/libvje/effects/complexsync.c
@@ -69,9 +69,10 @@ void complexsync_free() {
    	 c_outofsync_buffer[0] = NULL;
 }
 
-void complexsync_apply(VJFrame *frame, VJFrame *frame2, int width, int height, int val)
+void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val)
 {
 	const int len = frame->len;
+	const int width = frame->width;
  	uint8_t *Y = frame->data[0];
 	uint8_t *Cb = frame->data[1];
 	uint8_t *Cr = frame->data[2];
diff --git a/veejay-current/veejay-server/libvje/effects/complexsync.h b/veejay-current/veejay-server/libvje/effects/complexsync.h
index 0d05b233..bdb36ae1 100644
--- a/veejay-current/veejay-server/libvje/effects/complexsync.h
+++ b/veejay-current/veejay-server/libvje/effects/complexsync.h
@@ -28,5 +28,5 @@
 vj_effect *complexsync_init(int width, int height);
 int complexsync_malloc(int w, int h);
 void complexsync_free();
-void complexsync_apply(VJFrame *frame, VJFrame *frame2, int width, int height, int val);
+void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val);
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index d016af2c..e7313381 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -400,8 +400,7 @@ extern void complexsaturation_apply(VJFrame *frame, int angle, int r, int g, int
                                     int adj, int adjv, int inoise);
 extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int angle,
                                    int r, int g, int b, int level, int threshold);
-		
-extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int w, int h, int val );
+extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val );
 
 extern void enhancemask_apply(VJFrame *frame,int w, int h, int *t);
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 82cdd73c..8ba255df 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -555,8 +555,7 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in
 	} else { /* arg1 = off , copy arg*/
 	     todo_info->tmp[0] = arg[0];
 	}
-	complexsync_apply(frames[0], frames[1],frames[0]->width, frames[0]->height, 
-			todo_info->tmp[0]);
+	complexsync_apply(frames[0], frames[1], todo_info->tmp[0]);
 	break;
       case VJ_VIDEO_EFFECT_FADECOLORRGB:
 	if (arg[4] == 0) {

From c78bf7689ea957af510bd3a7c477300e5174c549 Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Wed, 11 May 2016 01:17:59 +0200
Subject: [PATCH 5/6] Libvje / refactor : enhancemask

* frame->h , frame->w
---
 veejay-current/veejay-server/libvje/effects/enhancemask.c | 7 +++++--
 veejay-current/veejay-server/libvje/effects/enhancemask.h | 2 +-
 veejay-current/veejay-server/libvje/internal.h            | 3 +--
 veejay-current/veejay-server/libvje/vj-effman.c           | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.c b/veejay-current/veejay-server/libvje/effects/enhancemask.c
index a1498901..3170028b 100644
--- a/veejay-current/veejay-server/libvje/effects/enhancemask.c
+++ b/veejay-current/veejay-server/libvje/effects/enhancemask.c
@@ -47,11 +47,14 @@ vj_effect *enhancemask_init(int width, int height)
     return ve;
 }
 
-void enhancemask_apply(VJFrame *frame, int width, int height, int *s ) {
+void enhancemask_apply(VJFrame *frame, int *s )
+{
 
    //int s[9]= { 1, 0, -1, 2, 0, -2, 1 , 0 , -1};
    unsigned int r;
-   const unsigned int len = (width*height)-width-1;
+	const int width = frame->width;
+	const int height = frame->height;
+   const unsigned int len = (frame->len)-width-1;
    uint8_t *Y = frame->data[0];
 	/*
    int sum=0;
diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.h b/veejay-current/veejay-server/libvje/effects/enhancemask.h
index 03e31d87..05915bb1 100644
--- a/veejay-current/veejay-server/libvje/effects/enhancemask.h
+++ b/veejay-current/veejay-server/libvje/effects/enhancemask.h
@@ -27,7 +27,7 @@
 vj_effect *enhancemask_init(int w, int h);
 
 
-void enhancemask_apply(VJFrame *frame, int w, int h, int *t);
+void enhancemask_apply(VJFrame *frame, int *t);
 
 void enhancemask_free();
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index e7313381..b1c7a733 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -401,8 +401,7 @@ extern void complexsaturation_apply(VJFrame *frame, int angle, int r, int g, int
 extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int angle,
                                    int r, int g, int b, int level, int threshold);
 extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val );
-
-extern void enhancemask_apply(VJFrame *frame,int w, int h, int *t);
+extern void enhancemask_apply(VJFrame *frame, int *t);
 
 extern void contrast_apply(VJFrame *frame, int w, int h, int *t);
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 8ba255df..edc47e9b 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -160,7 +160,7 @@ static void vj_effman_apply_image_effect(
 	contrast_apply(frames[0], frames[0]->width, frames[0]->height,arg);
 	break;
      case VJ_IMAGE_EFFECT_ENHANCEMASK:
-	enhancemask_apply(frames[0],frames[0]->width,frames[0]->height,arg);
+	enhancemask_apply(frames[0],arg);
 	break;
      case VJ_IMAGE_EFFECT_SOLARIZE:
 	solarize_apply(frames[0], arg[0]);

From 686f31b2ee8a8d006218412a09492dc30e4a154a Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Wed, 11 May 2016 01:22:33 +0200
Subject: [PATCH 6/6] Libvje / refactor : contrast

* frame->h , frame->w
---
 .../veejay-server/libvje/effects/contrast.c   | 33 +++++++++++--------
 .../veejay-server/libvje/effects/contrast.h   |  2 +-
 .../veejay-server/libvje/internal.h           |  3 +-
 .../veejay-server/libvje/vj-effman.c          |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/contrast.c b/veejay-current/veejay-server/libvje/effects/contrast.c
index b8ef3546..3225fe0f 100644
--- a/veejay-current/veejay-server/libvje/effects/contrast.c
+++ b/veejay-current/veejay-server/libvje/effects/contrast.c
@@ -56,11 +56,13 @@ vj_effect *contrast_init(int w, int h)
 }
 
 /* also from yuvdenoise */
-static void contrast_cb_apply(VJFrame *frame, int width,int height, int *s) {
+static void contrast_cb_apply(VJFrame *frame, int *s) {
 	unsigned int r;
 	register int cb;
 	register int cr;
 	const unsigned int uv_len = (frame->ssm ? frame->len: frame->uv_len);
+	const int width = frame->width;
+	const int height = frame->height;
 	uint8_t *Cb = frame->data[1];
 	uint8_t *Cr = frame->data[2];
 
@@ -82,10 +84,12 @@ static void contrast_cb_apply(VJFrame *frame, int width,int height, int *s) {
 	}
 }
 
-static void contrast_y_apply(VJFrame *frame, int width, int height, int *s) {
+static void contrast_y_apply(VJFrame *frame, int *s) {
    unsigned int r;
    register int m;
 	const int len = frame->len;
+	const int width = frame->width;
+	const int height = frame->height;
  	uint8_t *Y = frame->data[0];
 
    for(r=0; r < len; r++) {
@@ -99,19 +103,20 @@ static void contrast_y_apply(VJFrame *frame, int width, int height, int *s) {
 
 }
 
-void contrast_apply(VJFrame *frame, int width, int height, int *s ) {
-
-      switch(s[0]) {
-		  case 0:
-      	contrast_y_apply(frame, width,height, s);
-	  break;
-        case 1:
-	contrast_cb_apply(frame,width,height,s);
-		break;
+void contrast_apply(VJFrame *frame,int *s )
+{
+	switch(s[0])
+	{
+		case 0:
+			contrast_y_apply(frame, s);
+			break;
+		case 1:
+			contrast_cb_apply(frame, s);
+			break;
 		case 2:
-		contrast_y_apply(frame,width,height,s);
-		contrast_cb_apply(frame,width,height,s);
-		break;
+			contrast_y_apply(frame, s);
+			contrast_cb_apply(frame, s);
+			break;
 	}
 }
 
diff --git a/veejay-current/veejay-server/libvje/effects/contrast.h b/veejay-current/veejay-server/libvje/effects/contrast.h
index 48596404..f9131933 100644
--- a/veejay-current/veejay-server/libvje/effects/contrast.h
+++ b/veejay-current/veejay-server/libvje/effects/contrast.h
@@ -27,7 +27,7 @@
 vj_effect *contrast_init();
 
 
-void contrast_apply(VJFrame *frame, int w, int h, int *t);
+void contrast_apply(VJFrame *frame, int *t);
 
 void contrast_free();
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index b1c7a733..2c7914cc 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -402,8 +402,7 @@ extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int angle,
                                    int r, int g, int b, int level, int threshold);
 extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val );
 extern void enhancemask_apply(VJFrame *frame, int *t);
-
-extern void contrast_apply(VJFrame *frame, int w, int h, int *t);
+extern void contrast_apply(VJFrame *frame, int *t);
 
 extern void noiseadd_apply(VJFrame *frame, int w , int h , int t, int n);
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index edc47e9b..3a5b02fc 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -157,7 +157,7 @@ static void vj_effman_apply_image_effect(
 	noiseadd_apply(frames[0],frames[0]->width,frames[0]->height,arg[0],arg[1]);
 	break;
      case VJ_IMAGE_EFFECT_CONTRAST:
-	contrast_apply(frames[0], frames[0]->width, frames[0]->height,arg);
+	contrast_apply(frames[0], arg);
 	break;
      case VJ_IMAGE_EFFECT_ENHANCEMASK:
 	enhancemask_apply(frames[0],arg);