/** 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;