Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect error being raised when trying load a None object as an

Browse Source 
image with imagemagick.
This commit is contained in:
Kovid Goyal 2013-08-03 07:53:25 +05:30
parent ad5a5cc20e
commit 57437fb0b0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/utils/magick/__init__.py
View File

@ -60,12 +60,12 @@ class FontMetrics(object):
# }}} # }}}
class PixelWand(_magick.PixelWand): # {{{ class PixelWand(_magick.PixelWand): # {{{
pass pass
# }}} # }}}
class DrawingWand(_magick.DrawingWand): # {{{ class DrawingWand(_magick.DrawingWand): # {{{
@dynamic_property @dynamic_property
def font(self): def font(self):
@ -117,7 +117,7 @@ class DrawingWand(_magick.DrawingWand): # {{{
# }}} # }}}
class Image(_magick.Image): # {{{ class Image(_magick.Image): # {{{
@property @property
def clone(self): def clone(self):
@ -126,9 +126,9 @@ class Image(_magick.Image): # {{{
return ans return ans
def load(self, data): def load(self, data):
data = bytes(data)
if not data: if not data:
raise ValueError('Cannot open image from empty data string') raise ValueError('Cannot open image from empty data string')
data = bytes(data)
return _magick.Image.load(self, data) return _magick.Image.load(self, data)
def open(self, path_or_file): def open(self, path_or_file):
@ -165,7 +165,6 @@ class Image(_magick.Image): # {{{
self.type_ = val self.type_ = val
return property(fget=fget, fset=fset, doc=_magick.Image.type_.__doc__) return property(fget=fget, fset=fset, doc=_magick.Image.type_.__doc__)
@dynamic_property @dynamic_property
def size(self): def size(self):
def fget(self): def fget(self):
@ -181,7 +180,6 @@ class Image(_magick.Image): # {{{
self.size_ = (int(val[0]), int(val[1]), filter, blur) self.size_ = (int(val[0]), int(val[1]), filter, blur)
return property(fget=fget, fset=fset, doc=_magick.Image.size_.__doc__) return property(fget=fget, fset=fset, doc=_magick.Image.size_.__doc__)
def save(self, path, format=None): def save(self, path, format=None):
if format is None: if format is None:
ext = os.path.splitext(path)[1] ext = os.path.splitext(path)[1]