Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ec065b78 authored by Thomas Zander's avatar Thomas Zander

Fixlets

svn path=/trunk/koffice/; revision=691916
parent a29b20e1
...@@ -136,7 +136,7 @@ void KritaShape::tryLoadFromImageData(KoImageData *data) { ...@@ -136,7 +136,7 @@ void KritaShape::tryLoadFromImageData(KoImageData *data) {
KUrl url = data->imageLocation(); KUrl url = data->imageLocation();
QImage image = data->image(); QImage image = data->image();
if(url.isEmpty() || image.isNull()) if(url.isEmpty() && image.isNull())
return; return;
delete m_d->doc; delete m_d->doc;
...@@ -164,6 +164,7 @@ QImage KritaShape::convertToQImage() ...@@ -164,6 +164,7 @@ QImage KritaShape::convertToQImage()
KisImageSP img = m_d->doc->image(); KisImageSP img = m_d->doc->image();
return img->convertToQImage( 0, 0, img->width(), img->height(), m_d->displayProfile ); return img->convertToQImage( 0, 0, img->width(), img->height(), m_d->displayProfile );
} }
return QImage();
} }
#include "KritaShape.moc" #include "KritaShape.moc"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment