projects
/
imagemagick
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15cace9
)
(no commit message)
author
cristy
<urban-warrior@git.imagemagick.org>
Tue, 14 Jan 2014 17:02:30 +0000
(17:02 +0000)
committer
cristy
<urban-warrior@git.imagemagick.org>
Tue, 14 Jan 2014 17:02:30 +0000
(17:02 +0000)
Magick++/lib/Image.cpp
patch
|
blob
|
history
diff --git
a/Magick++/lib/Image.cpp
b/Magick++/lib/Image.cpp
index e9c628135e647f4446966839d18fbaaf17b67357..280b75bde0994deec89a5c1733eac3980ddf8d78 100644
(file)
--- a/
Magick++/lib/Image.cpp
+++ b/
Magick++/lib/Image.cpp
@@
-2296,7
+2296,10
@@
void Magick::Image::colorMap(const size_t index_,const Color &color_)
Magick::Color Magick::Image::colorMap(const size_t index_) const
{
if (!constImage()->colormap)
- throwExceptionExplicit(OptionError,"Image does not contain a colormap");
+ {
+ throwExceptionExplicit(OptionError,"Image does not contain a colormap");
+ return(Color());
+ }
if (index_ > constImage()->colors-1)
throwExceptionExplicit(OptionError,"Index out of range");