Browse Source

Wrap std::min calls in paranthesis to prevent macro expansion on windows

Fixes #659.
v1.x
Jesper Ek 9 years ago
parent
commit
8afe39110e
  1. 8
      src/CanvasRenderingContext2d.cc

8
src/CanvasRenderingContext2d.cc

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

Loading…
Cancel
Save