diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 402b53798..1ad17a039 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -81,9 +81,6 @@ html_expands.append({u'desc':u'Italics', u'start tag':u'{it}', u'start html':u'', u'end tag':u'{/it}', u'end html':u'', u'protected':True}) -# Image image_cache to stop regualar image resizing -image_cache = {} - def translate(context, text, comment=None): """ A special shortcut method to wrap around the Qt4 translation functions. @@ -261,20 +258,14 @@ def resize_image(image, width, height, background=QtCore.Qt.black): return preview preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - image_cache_key = u'%s%s%s' % (image, unicode(width), unicode(height)) - if image_cache_key in image_cache: - log.debug(u'resize_image - end cache') - return image_cache[image_cache_key] realw = preview.width() realh = preview.height() # and move it to the centre of the preview space new_image = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied) - new_image.fill(background) painter = QtGui.QPainter(new_image) + painter.fillRect(new_image.rect(), background) painter.drawImage((width - realw) / 2, (height - realh) / 2, preview) - image_cache[image_cache_key] = new_image - log.debug(u'resize_image - end') return new_image def check_item_selected(list_widget, message): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 2bf6394cd..629013cc5 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -650,9 +650,12 @@ class ServiceManager(QtGui.QWidget): .get_service_repr()}) if item[u'service_item'].uses_file(): for frame in item[u'service_item'].get_frames(): - path_from = unicode(os.path.join( - frame[u'path'], - frame[u'title'])) + if item[u'service_item'].is_image(): + path_from = frame[u'path'] + else: + path_from = unicode(os.path.join( + frame[u'path'], + frame[u'title'])) # On write a file once if not path_from in write_list: write_list.append(path_from)