diff options
| author | cristy <urban-warrior@git.imagemagick.org> | 2015-04-05 13:38:40 +0000 |
|---|---|---|
| committer | cristy <urban-warrior@git.imagemagick.org> | 2015-04-05 13:38:40 +0000 |
| commit | d9b47c63dc5ef8f7f38d1aa7e012306696f8bf57 (patch) | |
| tree | 995301d18869406fb052322e5cd0fe7707fd68f1 /Magick++ | |
| parent | ca5add7e8a1811246f53c89913771ac6a9c45901 (diff) | |
| download | ImageMagick-d9b47c63dc5ef8f7f38d1aa7e012306696f8bf57.tar.gz | |
Diffstat (limited to 'Magick++')
| -rw-r--r-- | Magick++/lib/Pixels.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp index 54e011ad4..84685323a 100644 --- a/Magick++/lib/Pixels.cpp +++ b/Magick++/lib/Pixels.cpp @@ -153,8 +153,8 @@ void Magick::PixelData::init(Magick::Image &image_,const ::ssize_t x_, _length=0; _size=0; if ((x_ < 0) || (width_ == 0) || (y_ < 0) || (height_ == 0) || - (x_ > (ssize_t) image_.columns()) || (((ssize_t) width_ + x_) > (ssize_t) image_.columns()) - || (y_ > (ssize_t) image_.rows()) || (((ssize_t) height_ + y_) > (ssize_t) image_.rows()) + (x_ > (ssize_t) image_.columns()) || ((width_ + x_) > image_.columns()) + || (y_ > (ssize_t) image_.rows()) || ((height_ + y_) > image_.rows()) || (map_.length() == 0)) return; |