From bf122ad8f307fafd38cfd889f1e7b6f29ee43f4e Mon Sep 17 00:00:00 2001 From: "[d.j.a.y] Jerome Blanchi" Date: Sun, 31 Jul 2016 14:20:41 +0200 Subject: [PATCH] Libvje / refactor : bathroom (fix) * clean headers * unsigned --- .../veejay-server/libvje/effects/bathroom.c | 31 +++++++++---------- .../veejay-server/libvje/effects/bathroom.h | 4 --- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/veejay-current/veejay-server/libvje/effects/bathroom.c b/veejay-current/veejay-server/libvje/effects/bathroom.c index 914869e7..25421f36 100644 --- a/veejay-current/veejay-server/libvje/effects/bathroom.c +++ b/veejay-current/veejay-server/libvje/effects/bathroom.c @@ -24,13 +24,10 @@ to set the distance and mode */ -#include -#include -#include -#include +#include "common.h" #include #include "bathroom.h" -#include "common.h" + static uint8_t *bathroom_frame[4] = { NULL,NULL,NULL,NULL }; vj_effect *bathroom_init(int width,int height) @@ -97,9 +94,9 @@ void bathroom_free() { static void bathroom_verti_apply(VJFrame *frame, int val, int x0, int x1) { - const int width = frame->width; - const int height = frame->height; - const int len = frame->len; + const unsigned int width = frame->width; + const unsigned int height = frame->height; + const unsigned int len = frame->len; unsigned int y_val = val; unsigned int x,y; uint8_t *Y = frame->data[0]; @@ -125,9 +122,9 @@ static void bathroom_verti_apply(VJFrame *frame, int val, int x0, int x1) static void bathroom_alpha_verti_apply(VJFrame *frame, int val, int x0, int x1) { - const int width = frame->width; - const int height = frame->height; - const int len = frame->len; + const unsigned int width = frame->width; + const unsigned int height = frame->height; + const unsigned int len = frame->len; unsigned int y_val = val; unsigned int x,y; uint8_t *Y = frame->data[0]; @@ -156,9 +153,9 @@ static void bathroom_alpha_verti_apply(VJFrame *frame, int val, int x0, int x1) static void bathroom_hori_apply(VJFrame *frame, int val, int x0, int x1) { - const int width = frame->width; - const int height = frame->height; - const int len = frame->len; + const unsigned int width = frame->width; + const unsigned int height = frame->height; + const unsigned int len = frame->len; unsigned int y_val = val; uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; @@ -183,9 +180,9 @@ static void bathroom_hori_apply(VJFrame *frame, int val, int x0, int x1) static void bathroom_alpha_hori_apply(VJFrame *frame, int val, int x0, int x1) { - const int width = frame->width; - const int height = frame->height; - const int len = frame->len; + const unsigned int width = frame->width; + const unsigned int height = frame->height; + const unsigned int len = frame->len; unsigned int y_val = val; uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; diff --git a/veejay-current/veejay-server/libvje/effects/bathroom.h b/veejay-current/veejay-server/libvje/effects/bathroom.h index 17a776cf..7b6d2f22 100644 --- a/veejay-current/veejay-server/libvje/effects/bathroom.h +++ b/veejay-current/veejay-server/libvje/effects/bathroom.h @@ -20,10 +20,6 @@ #ifndef BATHROOM_H #define BATHROOM_H -#include -#include -#include - vj_effect *bathroom_init(int w, int h); int bathroom_malloc(int w, int h); void bathroom_free();