X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ffilter_sepia.c;h=aa20b23a71a8c3546b8b02c5a790bf43243d168e;hb=e89b21b07607ae485f56b32f3e67f83f528f2ae6;hp=0e3b6e9fb715e9ad1e9eb217e72a409bf1607cb6;hpb=6feaaeac76d4f062d27c4c783e24f8052949a7b5;p=melted

diff --git a/src/modules/plus/filter_sepia.c b/src/modules/plus/filter_sepia.c
index 0e3b6e9..aa20b23 100644
--- a/src/modules/plus/filter_sepia.c
+++ b/src/modules/plus/filter_sepia.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_sepia.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -38,23 +37,35 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	int error = mlt_frame_get_image( this, image, format, width, height, 1 );
 
 	// Only process if we have no error and a valid colour space
-	if ( error == 0 && *format == mlt_image_yuv422 )
+	if ( error == 0 && *image && *format == mlt_image_yuv422 )
 	{
 		// We modify the whole image
 		uint8_t *p = *image;
-		uint8_t *q = *image + *height * *width * 2;
+		int h = *height;
+		int uneven = *width % 2;
+		int w = ( *width - uneven ) / 2;
+		int t;
 
 		// Get u and v values
-		int u = mlt_properties_get_int( mlt_filter_properties( filter ), "u" );
-		int v = mlt_properties_get_int( mlt_filter_properties( filter ), "v" );
+		int u = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "u" );
+		int v = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "v" );
 
 		// Loop through image
-		while ( p != q )
+		while( h -- )
 		{
-			p ++;
-			*p ++ = u;
-			p ++;
-			*p ++ = v;
+			t = w;
+			while( t -- )
+			{
+				p ++;
+				*p ++ = u;
+				p ++;
+				*p ++ = v;
+			}
+			if ( uneven )
+			{
+				p ++;
+				*p ++ = u;
+			}
 		}
 	}
 
@@ -75,14 +86,14 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_sepia_init( char *arg )
+mlt_filter filter_sepia_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
 		this->process = filter_process;
-		mlt_properties_set( mlt_filter_properties( this ), "u", "75" );
-		mlt_properties_set( mlt_filter_properties( this ), "v", "150" );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "u", "75" );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "v", "150" );
 	}
 	return this;
 }