Verify image has been loaded correctly.

This commit is contained in:
Kurt Loeffler 2015-12-26 15:52:48 -08:00 committed by Ghostkeeper
parent 447fdc8fbc
commit 82b5bbc283

View File

@ -12,6 +12,7 @@ from UM.Mesh.MeshData import MeshData
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Job import Job from UM.Job import Job
from UM.Logger import Logger
from .ImageReaderUI import ImageReaderUI from .ImageReaderUI import ImageReaderUI
@ -42,6 +43,11 @@ class ImageReader(MeshReader):
scene_node.setMeshData(mesh) scene_node.setMeshData(mesh)
img = QImage(file_name) img = QImage(file_name)
if img.isNull():
Logger.log("e", "Image is corrupt.")
return None
width = max(img.width(), 2) width = max(img.width(), 2)
height = max(img.height(), 2) height = max(img.height(), 2)
aspect = height / width aspect = height / width