Apply cosmetic cleanup part of ldflags_order patch from Alberto Villa.

[melted] / src / modules / plus / filter_invert.c

diff --git a/src/modules/plus/filter_invert.c b/src/modules/plus/filter_invert.c
index 407a587..4385fc8 100644 (file)
--- a/src/modules/plus/filter_invert.c
+++ b/src/modules/plus/filter_invert.c
@@ -3,28 +3,33 @@
  * 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_invert.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
+
+static inline int clamp( int v, int l, int u )
+{
+       return v < l ? l : ( v > u ? u : v );
+}
 
 /** Do it :-).
 */
@@ -32,6 +37,8 @@
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        // Get the image
+       mlt_filter filter = mlt_frame_pop_service( this );
+       int mask = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "alpha" );
        int error = mlt_frame_get_image( this, image, format, width, height, 1 );
 
        // Only process if we have no error and a valid colour space
@@ -43,8 +50,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 
                while ( p != q )
                {
-                       *p ++ = 251 - *r ++;
-                       *p ++ = 251 - *r ++;
+                       *p ++ = clamp( 251 - *r ++, 16, 235 );
+                       *p ++ = clamp( 256 - *r ++, 16, 240 );
+               }
+
+               if ( mask )
+               {
+                       uint8_t *alpha = mlt_frame_get_alpha_mask( this );
+                       int size = *width * *height;
+                       memset( alpha, mask, size );
                }
        }
 
@@ -57,6 +71,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
        // Push the frame filter
+       mlt_frame_push_service( frame, this );
        mlt_frame_push_get_image( frame, filter_get_image );
        return frame;
 }
@@ -64,7 +79,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_invert_init( char *arg )
+mlt_filter filter_invert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )