fixed building BRISK on Windows

pull/27/merge
Vadim Pisarevsky 13 years ago
parent 3ca0cc2253
commit 014106783d
  1. 790
      modules/features2d/src/brisk.cpp
  2. 2
      modules/imgproc/src/imgwarp.cpp

File diff suppressed because it is too large Load Diff

@ -1314,7 +1314,7 @@ public:
ssize.width *= cn;
int dy, dx, k = 0;
VecOp vop(scale_x, scale_y, src.channels(), src.step/*, area_ofs*/);
VecOp vop(scale_x, scale_y, src.channels(), (int)src.step/*, area_ofs*/);
for( dy = range.start; dy < range.end; dy++ )
{

Loading…
Cancel
Save