* 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 "transition_affine.h"
+#include <framework/mlt_transition.h>
#include <framework/mlt.h>
#include <stdio.h>
/** Calculate real geometry.
*/
-static void geometry_calculate( mlt_transition this, char *store, struct mlt_geometry_item_s *output, float position )
+static void geometry_calculate( mlt_transition this, const char *store, struct mlt_geometry_item_s *output, float position )
{
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
mlt_geometry geometry = mlt_properties_get_data( properties, store, NULL );
}
-static mlt_geometry transition_parse_keys( mlt_transition this, char *name, char *store, int normalised_width, int normalised_height )
+static mlt_geometry transition_parse_keys( mlt_transition this, const char *name, const char *store, int normalised_width, int normalised_height )
{
// Get the properties of the transition
mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
return start;
}
-static inline float composite_calculate_key( mlt_transition this, char *name, char *store, int norm, float position )
+static inline float composite_calculate_key( mlt_transition this, const char *name, const char *store, int norm, float position )
{
// Struct for the result
struct mlt_geometry_item_s result;
return result.x;
}
-typedef struct
+typedef struct
{
float matrix[3][3];
}
affine_rotate_x( affine->matrix, fix_rotate_x + rotate_x * position );
affine_rotate_y( affine->matrix, fix_rotate_y + rotate_y * position );
affine_rotate_z( affine->matrix, fix_rotate_z + rotate_z * position );
- affine_shear( affine->matrix,
- fix_shear_x + shear_x * position,
+ affine_shear( affine->matrix,
+ fix_shear_x + shear_x * position,
fix_shear_y + shear_y * position,
fix_shear_z + shear_z * position );
affine_offset( affine->matrix, ox, oy );
int cx = result.x + ( b_width >> 1 );
int cy = result.y + ( b_height >> 1 );
-
+ cx -= cx % 2;
+
int lower_x = 0 - cx;
int upper_x = *width - cx;
int lower_y = 0 - cy;
if ( dx >= 0 && dx < b_width && dy >=0 && dy < b_height )
{
- *pmask ++;
+ pmask ++;
dx -= dx & 1;
*p ++ = *( b_image + dy * b_stride + ( dx << 1 ) );
*p ++ = *( b_image + dy * b_stride + ( dx << 1 ) + ( ( x & 1 ) << 1 ) + 1 );
/** Constructor for the filter.
*/
-mlt_transition transition_affine_init( char *arg )
+mlt_transition transition_affine_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
mlt_transition transition = mlt_transition_new( );
if ( transition != NULL )