|
@ -592,8 +592,8 @@ NAN_METHOD(Context2d::PutImageData) { |
|
|
switch (info.Length()) { |
|
|
switch (info.Length()) { |
|
|
// imageData, dx, dy
|
|
|
// imageData, dx, dy
|
|
|
case 3: |
|
|
case 3: |
|
|
cols = std::min(imageData->width(), context->canvas()->width - dx); |
|
|
cols = (std::min)(imageData->width(), context->canvas()->width - dx); |
|
|
rows = std::min(imageData->height(), context->canvas()->height - dy); |
|
|
rows = (std::min)(imageData->height(), context->canvas()->height - dy); |
|
|
break; |
|
|
break; |
|
|
// imageData, dx, dy, sx, sy, sw, sh
|
|
|
// imageData, dx, dy, sx, sy, sw, sh
|
|
|
case 7: |
|
|
case 7: |
|
@ -617,8 +617,8 @@ NAN_METHOD(Context2d::PutImageData) { |
|
|
if (dx < 0) sw += dx, sx -= dx, dx = 0; |
|
|
if (dx < 0) sw += dx, sx -= dx, dx = 0; |
|
|
if (dy < 0) sh += dy, sy -= dy, dy = 0; |
|
|
if (dy < 0) sh += dy, sy -= dy, dy = 0; |
|
|
// clamp width at canvas size
|
|
|
// clamp width at canvas size
|
|
|
cols = std::min(sw, context->canvas()->width - dx); |
|
|
cols = (std::min)(sw, context->canvas()->width - dx); |
|
|
rows = std::min(sh, context->canvas()->height - dy); |
|
|
rows = (std::min)(sh, context->canvas()->height - dy); |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
return Nan::ThrowError("invalid arguments"); |
|
|
return Nan::ThrowError("invalid arguments"); |
|
|