Skip to content

Commit

Permalink
Merge branch 'master' into multiplane1
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Jun 28, 2017
2 parents 53babbf + e983491 commit e892dc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion SpriteSheet/SpriteSheet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class SpriteSheetProcessor
PIX *dstPix = (PIX *) _dstImg->getPixelAddress(procWindow.x1, y);

for (int x = procWindow.x1; x < procWindow.x2; ++x, dstPix += nComponents) {
const PIX *srcPix = (const PIX*)_srcImg->getPixelAddress(x + _cropRectPixel.x1, y + _cropRectPixel.y1);
const PIX *srcPix = _srcImg ? (const PIX*)_srcImg->getPixelAddress(x + _cropRectPixel.x1, y + _cropRectPixel.y1) : 0;
if (srcPix) {
// inside of the rectangle
for (int k = 0; k < nComponents; ++k) {
Expand Down

0 comments on commit e892dc4

Please sign in to comment.