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

fixed compile warnings and removed extra whitespaces

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-07-28 15:20:25 +04:00
parent 4dfb613c3e
commit 4255746c00
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ public:
{ {
return 0; return 0;
} }
int bayer2RGBA(const T*, int, T*, int, int) const int bayer2RGBA(const T*, int, T*, int, int) const
{ {
return 0; return 0;
@@ -223,7 +223,7 @@ public:
return (int)(bayer - (bayer_end - width)); return (int)(bayer - (bayer_end - width));
} }
int bayer2RGBA(const uchar* bayer, int bayer_step, uchar* dst, int width, int blue) const int bayer2RGBA(const uchar*, int, uchar*, int, int) const
{ {
return 0; return 0;
} }
@@ -395,7 +395,7 @@ public:
vst1_u8(dst, p.val[0]); vst1_u8(dst, p.val[0]);
vst1_u8(dst + 8, p.val[1]); vst1_u8(dst + 8, p.val[1]);
} }
return (int)(bayer - (bayer_end - width)); return (int)(bayer - (bayer_end - width));
} }
@@ -446,7 +446,7 @@ public:
return (int)(bayer - (bayer_end - width)); return (int)(bayer - (bayer_end - width));
} }
int bayer2RGBA(const uchar* bayer, int bayer_step, uchar* dst, int width, int blue) const int bayer2RGBA(const uchar* bayer, int bayer_step, uchar* dst, int width, int blue) const
{ {
/* /*
@@ -492,11 +492,11 @@ public:
vst4q_u8(dst-1, pix); vst4q_u8(dst-1, pix);
} }
return (int)(bayer - (bayer_end - width)); return (int)(bayer - (bayer_end - width));
} }
int bayer2RGB_EA(const uchar* bayer, int bayer_step, uchar* dst, int width, int blue) const int bayer2RGB_EA(const uchar*, int, uchar*, int, int) const
{ {
return 0; return 0;
} }
@@ -737,7 +737,7 @@ public:
} }
// simd optimization only for dcn == 3 // simd optimization only for dcn == 3
int delta = dcn == 4 ? int delta = dcn == 4 ?
vecOp.bayer2RGBA(bayer, bayer_step, dst, size.width, blue) : vecOp.bayer2RGBA(bayer, bayer_step, dst, size.width, blue) :
vecOp.bayer2RGB(bayer, bayer_step, dst, size.width, blue); vecOp.bayer2RGB(bayer, bayer_step, dst, size.width, blue);
bayer += delta; bayer += delta;