Skip to content

Commit 70636df

Browse files
generatedunixname1587093422349604meta-codesync[bot]
authored andcommitted
Fix CQS signal modernize-use-integer-sign-comparison in arvr/projects/ariane/aria_research_kit [A] (#371)
Summary: Pull Request resolved: #371 Reviewed By: PiotrBrzyski Differential Revision: D111912610 fbshipit-source-id: e2c1c8b582e25b6f6bcb1382aa23f093c69b9609
1 parent a65d9eb commit 70636df

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

core/calibration/camera_projections/FisheyeRadTanThinPrism.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include <calibration/camera_projections/Common.h>
2020

21+
#include <utility>
22+
2123
namespace projectaria::tools::calibration {
2224

2325
// Model for fisheye cameras with radial, tangential, and thin-prism distortion.
@@ -155,7 +157,7 @@ class FisheyeRadTanThinPrism {
155157
} else {
156158
T dthD_dth = static_cast<T>(1.0);
157159
T theta2i = thetaSq;
158-
for (size_t i = 0; i < numK; ++i) {
160+
for (size_t i = 0; std::cmp_less(i, numK); ++i) {
159161
dthD_dth += T(2 * i + 3) * params[startK + i] * theta2i;
160162
theta2i *= thetaSq;
161163
}
@@ -198,7 +200,7 @@ class FisheyeRadTanThinPrism {
198200
temp = params.template head<2>().cwiseProduct(th_divr * (duvDistorted_dxryr * ab));
199201
}
200202
T theta2i = thetaSq;
201-
for (size_t i = 0; i < numK; ++i) {
203+
for (size_t i = 0; std::cmp_less(i, numK); ++i) {
202204
d_param->col(startK + i) = theta2i * temp;
203205
theta2i *= thetaSq;
204206
}

core/data_provider/players/HandPosePlayer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include <fmt/format.h>
2020
#include <cmath>
21+
#include <utility>
2122

2223
#include <data_provider/players/DataPlayerUtils.h>
2324
#include <mps/HandTracking.h>
@@ -64,7 +65,7 @@ std::optional<HandTrackingResult::OneSide> populateOneSideHand(
6465
fmt::print("Missing handLandmarks3d_DeviceMeterXyz in hand pose data layout!");
6566
return {};
6667
}
67-
for (int landmarkIdx = 0; landmarkIdx < kHtLandmarksCount; ++landmarkIdx) {
68+
for (int landmarkIdx = 0; std::cmp_less(landmarkIdx, kHtLandmarksCount); ++landmarkIdx) {
6869
oneSide.landmarkPositions_device[landmarkIdx] =
6970
mapToEigenVector<float, double, 3>(vrsLandmarks3d.at(landmarkIdx));
7071
}

core/data_provider/test/VrsDataProviderGetDataByIndexTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <gmock/gmock-matchers.h>
2020
#include <gtest/gtest.h>
2121

22+
#include <utility>
23+
2224
using namespace projectaria::tools::data_provider;
2325
using namespace projectaria::tools::mps;
2426
using namespace projectaria::tools::data_provider::test;
@@ -38,7 +40,7 @@ void checkGetDataByIndex(
3840
size_t numData = provider->getNumData(streamId);
3941
int lastDeviceTime = -1;
4042

41-
for (int f = 0; f < numData; ++f) {
43+
for (int f = 0; std::cmp_less(f, numData); ++f) {
4244
const auto sensorData = provider->getSensorDataByIndex(streamId, f);
4345
EXPECT_EQ(sensorData.sensorDataType(), provider->getSensorDataType(streamId));
4446

core/gen2_mp_csv_exporter/file_io/MpvCsvWriter.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <fmt/format.h>
1818
#include <gen2_mp_csv_exporter/file_io/MpvCsvWriter.h>
1919
#include <iostream>
20+
#include <utility>
2021

2122
namespace {
2223
const std::string kEyeGazeCsvHeader =
@@ -38,7 +39,8 @@ const std::string kVioHighFreqCsvHeader =
3839
std::string getHandPoseCsvHeader() {
3940
std::string header = "tracking_timestamp_us,left_tracking_confidence";
4041
// Left landmarks
41-
for (int iLandmark = 0; iLandmark < projectaria::tools::mps::kNumHandLandmarks; ++iLandmark) {
42+
for (int iLandmark = 0; std::cmp_less(iLandmark, projectaria::tools::mps::kNumHandLandmarks);
43+
++iLandmark) {
4244
header += fmt::format(
4345
",tx_left_landmark_{}_device,ty_left_landmark_{}_device,tz_left_landmark_{}_device",
4446
iLandmark,
@@ -47,7 +49,8 @@ std::string getHandPoseCsvHeader() {
4749
}
4850
header += ",right_tracking_confidence";
4951
// Right landmarks
50-
for (int iLandmark = 0; iLandmark < projectaria::tools::mps::kNumHandLandmarks; ++iLandmark) {
52+
for (int iLandmark = 0; std::cmp_less(iLandmark, projectaria::tools::mps::kNumHandLandmarks);
53+
++iLandmark) {
5154
header += fmt::format(
5255
",tx_right_landmark_{}_device,ty_right_landmark_{}_device,tz_right_landmark_{}_device",
5356
iLandmark,

0 commit comments

Comments
 (0)