From 99eb2cea5b50ee8762f6bdab9c276f2799859f87 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Fri, 20 Aug 2010 00:29:05 -0700 Subject: [PATCH] Fix distorted frame in slideshow transitions. Applies to the .all.ext slideshow approach. May also apply to image sequences with mixed resolutions. --- src/modules/gtk2/producer_pixbuf.c | 2 +- src/modules/qimage/qimage_wrapper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 5059776f..c99d711e 100644 --- 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 98e6b593..b2627017 100644 --- 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 ) ); -- 2.39.2