From c6e6a4034db65b404fe525b63fb89ff97f413e18 Mon Sep 17 00:00:00 2001 From: j-b-m Date: Mon, 19 Feb 2007 08:34:51 +0000 Subject: [PATCH] Fix typo, credits and make functions static, (patch from stephane fillod - thanks) git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@951 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/core/filter_boxblur.c | 8 ++++---- src/modules/core/filter_boxblur.h | 9 ++++----- src/modules/core/filter_wave.c | 4 ++-- src/modules/core/filter_wave.h | 9 ++++----- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/modules/core/filter_boxblur.c b/src/modules/core/filter_boxblur.c index 543a657..43ae223 100644 --- a/src/modules/core/filter_boxblur.c +++ b/src/modules/core/filter_boxblur.c @@ -26,7 +26,7 @@ #include -void PreCompute(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int height) +static void PreCompute(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int height) { register int x, y, z; register int uneven = width % 2; @@ -94,7 +94,7 @@ void PreCompute(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int hei } } -int32_t GetRGB(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, int offsetx, unsigned int y, int offsety, unsigned int z) +static int32_t GetRGB(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, int offsetx, unsigned int y, int offsety, unsigned int z) { int xtheo = x * 2 + offsetx; int ytheo = y + offsety; @@ -103,7 +103,7 @@ int32_t GetRGB(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, int return rgb[3*(xtheo+ytheo*w)+z]; } -int32_t GetRGB2(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, int offsetx, unsigned int y, int offsety, unsigned int z) +static int32_t GetRGB2(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, int offsetx, unsigned int y, int offsety, unsigned int z) { int xtheo = x * 2 + 1 + offsetx; int ytheo = y + offsety; @@ -112,7 +112,7 @@ int32_t GetRGB2(int32_t *rgb, unsigned int w, unsigned int h, unsigned int x, in return rgb[3*(xtheo+ytheo*w)+z]; } -void DoBoxBlur(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int height, unsigned int boxw, unsigned int boxh) +static void DoBoxBlur(uint8_t *yuv, int32_t *rgb, unsigned int width, unsigned int height, unsigned int boxw, unsigned int boxh) { register int x, y; int32_t r, g, b; diff --git a/src/modules/core/filter_boxblur.h b/src/modules/core/filter_boxblur.h index ad8e216..f942e85 100644 --- a/src/modules/core/filter_boxblur.h +++ b/src/modules/core/filter_boxblur.h @@ -1,7 +1,6 @@ /* - * filter_luma.h -- luma filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates + * filter_boxblur.h -- box blur filter + * Author: Leny Grisel * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +17,8 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _FILTER_BLUR_H_ -#define _FILTER_BLUR_H_ +#ifndef _FILTER_BOXBLUR_H_ +#define _FILTER_BOXBLUR_H_ #include diff --git a/src/modules/core/filter_wave.c b/src/modules/core/filter_wave.c index f3c14e1..add9327 100644 --- a/src/modules/core/filter_wave.c +++ b/src/modules/core/filter_wave.c @@ -26,7 +26,7 @@ #include // this is a utility function used by DoWave below -uint8_t getPoint(uint8_t *src, int w, int h, int x, int y, int z) +static uint8_t getPoint(uint8_t *src, int w, int h, int x, int y, int z) { if (x<0) x+=-((-x)%w)+w; else if (x>=w) x=x%w; if (y<0) y+=-((-y)%h)+h; else if (y>=h) y=y%h; @@ -34,7 +34,7 @@ uint8_t getPoint(uint8_t *src, int w, int h, int x, int y, int z) } // the main meat of the algorithm lies here -void DoWave(uint8_t *src, int src_w, int src_h, uint8_t *dst, mlt_position position, int speed, int factor, int deformX, int deformY) +static void DoWave(uint8_t *src, int src_w, int src_h, uint8_t *dst, mlt_position position, int speed, int factor, int deformX, int deformY) { register int x, y; int decalY, decalX, z; diff --git a/src/modules/core/filter_wave.h b/src/modules/core/filter_wave.h index cd9b9eb..e45a1e2 100644 --- a/src/modules/core/filter_wave.h +++ b/src/modules/core/filter_wave.h @@ -1,7 +1,6 @@ /* - * filter_luma.h -- luma filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates + * filter_wave.h -- wave filter + * Author: Leny Grisel * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +17,8 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _FILTER_BLUR_H_ -#define _FILTER_BLUR_H_ +#ifndef _FILTER_WAVE_H_ +#define _FILTER_WAVE_H_ #include -- 1.7.4.4