Fix v4l2 signal threshold comparison

Former-commit-id: 698a22af752fc42e778e97587938ed6542653bd9
This commit is contained in:
johan 2014-03-22 14:49:24 +01:00
parent 932b3d7f5a
commit c3ba03e0ee
3 changed files with 8 additions and 2 deletions

View File

@ -1 +1 @@
0172259694aa374d6ae32dcbd122a62ce5bd3b05 90bef144811aa3c3db8620622b57e76f699f0121

View File

@ -55,3 +55,9 @@ inline bool operator<(const ColorRgb & lhs, const ColorRgb & rhs)
{ {
return (lhs.red < rhs.red) && (lhs.green < rhs.green) && (lhs.blue < rhs.blue); return (lhs.red < rhs.red) && (lhs.green < rhs.green) && (lhs.blue < rhs.blue);
} }
/// Compare operator to check if a color is 'smaller' than or 'equal' to another color
inline bool operator<=(const ColorRgb & lhs, const ColorRgb & rhs)
{
return (lhs.red <= rhs.red) && (lhs.green <= rhs.green) && (lhs.blue <= rhs.blue);
}

View File

@ -695,7 +695,7 @@ void V4L2Grabber::process_image(const uint8_t * data)
ColorRgb & rgb = image(xDest, yDest); ColorRgb & rgb = image(xDest, yDest);
yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue); yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
noSignal &= rgb < _noSignalThresholdColor; noSignal &= rgb <= _noSignalThresholdColor;
} }
} }