Fix build w/ OpenCV, fix cppcheck warnings
Merge pull request #390 from tribal-tec/master

Fix build w/ OpenCV, fix cppcheck warnings