fix BSTR string conversion under Windows

[mlt] / src / modules / plus / filter_charcoal.c

diff --git a/src/modules/plus/filter_charcoal.c b/src/modules/plus/filter_charcoal.c
index e99981a56add6ddeb096bb95e24eb8574224f39b..40bc1a1faee116f8a04e1450964ad75c294d982a 100644 (file)
--- a/src/modules/plus/filter_charcoal.c
+++ b/src/modules/plus/filter_charcoal.c
@@ -72,10 +72,11 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        mlt_filter filter = mlt_frame_pop_service( this );
 
        // Get the image
+       *format = mlt_image_yuv422;
        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 )
        {
                // Get the charcoal scatter value
                int x_scatter = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "x_scatter" );
@@ -137,7 +138,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                *image = temp;
 
                // Store new and destroy old
-               mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", *image, *width * *height * 2, mlt_pool_release, NULL );
+               mlt_frame_set_image( this, *image, *width * *height * 2, mlt_pool_release );
        }
 
        return error;
@@ -164,10 +165,10 @@ mlt_filter filter_charcoal_init( mlt_profile profile, mlt_service_type type, con
        if ( this != NULL )
        {
                this->process = filter_process;
-               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "x_scatter", "1" );
-               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "y_scatter", "1" );
-               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "scale", "1.5" );
-               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "mix", "0" );
+               mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "x_scatter", 1 );
+               mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "y_scatter", 1 );
+               mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "scale", 1.5 );
+               mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "mix", 0.0 );
        }
        return this;
 }