generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix x64 build warnings

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-25 11:08:27 +04:00
parent 2a6fb2867e
commit d586f4a103
10 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/demosaicing.cpp
View File

@@ -1306,7 +1306,7 @@ public:
int dcn = dst.channels();
int dcn2 = dcn<<1;
int start_with_green = Start_with_green, blue = Blue;
int sstep = src.step / src.elemSize1(), dstep = dst.step / dst.elemSize1();
int sstep = int(src.step / src.elemSize1()), dstep = int(dst.step / dst.elemSize1());
SIMDInterpolator vecOp;
const T* S = reinterpret_cast<const T*>(src.data + (range.start + 1) * src.step) + 1;
@@ -1415,7 +1415,7 @@ static void Bayer2RGB_EdgeAware_T(const Mat& src, Mat& dst, int code)
}
size = dst.size();
size.width *= dst.channels();
int dstep = dst.step / dst.elemSize1();
size_t dstep = dst.step / dst.elemSize1();
T* firstRow = reinterpret_cast<T*>(dst.data);
T* lastRow = reinterpret_cast<T*>(dst.data) + (size.height-1) * dstep;
@@ -1423,8 +1423,8 @@ static void Bayer2RGB_EdgeAware_T(const Mat& src, Mat& dst, int code)
{
for (int x = 0; x < size.width; ++x)
{
firstRow[x] = firstRow[dstep+x];
lastRow[x] = lastRow[-dstep+x];
firstRow[x] = (firstRow+dstep)[x];
lastRow[x] = (lastRow-dstep)[x];
}
}
else

9
modules/imgproc/src/floodfill.cpp
View File

@@ -505,14 +505,15 @@ int cv::floodFill( InputOutputArray _image, InputOutputArray _mask,
if( is_simple )
{
int elem_size = img.elemSize();
size_t elem_size = img.elemSize();
const uchar* seed_ptr = img.data + img.step*seedPoint.y + elem_size*seedPoint.x;
for(i = 0; i < elem_size; i++)
if (seed_ptr[i] != nv_buf.b[i])
size_t k = 0;
for(; k < elem_size; k++)
if (seed_ptr[k] != nv_buf.b[k])
break;
if( i != elem_size )
if( k != elem_size )
{
if( type == CV_8UC1 )
floodFill_CnIR(img, seedPoint, nv_buf.b[0], &comp, flags, &buffer);

14
modules/imgproc/src/samplers.cpp
View File

@@ -46,7 +46,7 @@ namespace cv
{
static const uchar*
adjustRect( const uchar* src, int src_step, int pix_size,
adjustRect( const uchar* src, size_t src_step, int pix_size,
Size src_size, Size win_size,
Point ip, Rect* pRect )
{
@@ -127,8 +127,8 @@ struct nop
template<typename _Tp, typename _DTp, typename _WTp, class ScaleOp, class CastOp>
void getRectSubPix_Cn_(const _Tp* src, int src_step, Size src_size,
_DTp* dst, int dst_step, Size win_size, Point2f center, int cn )
void getRectSubPix_Cn_(const _Tp* src, size_t src_step, Size src_size,
_DTp* dst, size_t dst_step, Size win_size, Point2f center, int cn )
{
ScaleOp scale_op;
CastOp cast_op;
@@ -217,8 +217,8 @@ void getRectSubPix_Cn_(const _Tp* src, int src_step, Size src_size,
static void getRectSubPix_8u32f
( const uchar* src, int src_step, Size src_size,
float* dst, int dst_step, Size win_size, Point2f center0, int cn )
( const uchar* src, size_t src_step, Size src_size,
float* dst, size_t dst_step, Size win_size, Point2f center0, int cn )
{
Point2f center = center0;
Point ip;
@@ -269,8 +269,8 @@ static void getRectSubPix_8u32f
static void
getQuadrangleSubPix_8u32f_CnR( const uchar* src, int src_step, Size src_size,
float* dst, int dst_step, Size win_size,
getQuadrangleSubPix_8u32f_CnR( const uchar* src, size_t src_step, Size src_size,
float* dst, size_t dst_step, Size win_size,
const double *matrix, int cn )
{
int x, y, k;

4
modules/imgproc/src/segmentation.cpp
View File

@@ -148,9 +148,9 @@ void cv::watershed( InputArray _src, InputOutputArray _markers )
CV_Assert( src.size() == dst.size() );
const uchar* img = src.data;
int istep = src.step/sizeof(img[0]);
int istep = int(src.step/sizeof(img[0]));
int* mask = dst.ptr<int>();
int mstep = dst.step / sizeof(mask[0]);
int mstep = int(dst.step / sizeof(mask[0]));
for( i = 0; i < 256; i++ )
subs_tab[i] = 0;