From 6f04e4ca46e6f2dcd3eda63529a1bbd915f7676b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 28 Dec 2018 03:02:57 +0100 Subject: clang-tidy fixes only Maybe global `-Wcomma' is too harsh. There should be no functional changes whatsoever. --- tracker-pt/module/camera.cpp | 2 +- tracker-pt/module/point_extractor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tracker-pt/module') diff --git a/tracker-pt/module/camera.cpp b/tracker-pt/module/camera.cpp index f9d9ff48..86cffd72 100644 --- a/tracker-pt/module/camera.cpp +++ b/tracker-pt/module/camera.cpp @@ -88,7 +88,7 @@ bool Camera::start(int idx, int fps, int res_x, int res_y) if (idx >= 0 && fps >= 0 && res_x >= 0 && res_y >= 0) { if (cam_desired.idx != idx || - cam_desired.fps != fps || + (int)cam_desired.fps != fps || cam_desired.res_x != res_x || cam_desired.res_y != res_y || !cap || !cap->isOpened() || !cap->grab()) diff --git a/tracker-pt/module/point_extractor.cpp b/tracker-pt/module/point_extractor.cpp index c0756a40..80d9dfc2 100644 --- a/tracker-pt/module/point_extractor.cpp +++ b/tracker-pt/module/point_extractor.cpp @@ -285,7 +285,7 @@ void PointExtractor::extract_points(const pt_frame& frame_, pt_preview& preview_ // XXX we could go to the next scanline unless the points are really small. // i'd expect each point being present on at least one unique scanline // but it turns out some people are using 2px points -sh 20180110 -#if BROKEN && 0 +#if defined BROKEN && 0 break; #endif } -- cgit v1.2.3