Fix distorted frame in slideshow transitions.

Applies to the .all.ext slideshow approach. May also apply to image
sequences with mixed resolutions.

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 5059776f82ee07e1882c8ac480385dcec3ab765b..c99d711e0bcc4708189a4496bd76c2ac6fd0d1ec 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -281,7 +281,7 @@ static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int
                pixbuf = NULL;
        mlt_log_debug( MLT_PRODUCER_SERVICE( producer ), "image %p pixbuf %p idx %d image_idx %d pixbuf_idx %d width %d\n",
                this->image, pixbuf, image_idx, this->image_idx, this->pixbuf_idx, width );
-       if ( ( !pixbuf && !this->image ) || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
+       if ( !pixbuf || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
        {
                this->image = NULL;
                pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( this->filenames, image_idx ), &error );

diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index 98e6b593d10fc97f86fc725e836ee88ea9ff63ea..b2627017d9c14f23277142490e059ee2fdf18647 100644 (file)
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -164,7 +164,7 @@ void refresh_qimage( producer_qimage self, mlt_frame frame, int width, int heigh
        if ( image_idx != self->qimage_idx )
                qimage = NULL;
 
-       if ( ( !qimage && !self->current_image ) || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif)
+       if ( !qimage || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif)
        {
                self->current_image = NULL;
                qimage = new QImage( mlt_properties_get_value( self->filenames, image_idx ) );