Skip to content

Commit f8cbe01

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

5 files changed

Lines changed: 13 additions & 7 deletions

File tree

core/image/ImageIterator.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#pragma once
1818

1919
#include <iterator>
20+
#include <utility>
2021

2122
#include "Portability.h"
2223

@@ -139,7 +140,7 @@ class ImageIterator {
139140
}
140141
PROJECTARIA_HOST_DEVICE_INLINE void stepForward(const difference_type delta) {
141142
const size_t remainingInRow = std::distance(ptr, rowEnd);
142-
if (remainingInRow <= delta) {
143+
if (std::cmp_less_equal(remainingInRow, delta)) {
143144
const size_t w = width();
144145
const size_t numRows = 1 + (delta - remainingInRow) / w;
145146
const size_t rowPosition = (delta - remainingInRow) % w;
@@ -152,7 +153,7 @@ class ImageIterator {
152153
}
153154
PROJECTARIA_HOST_DEVICE_INLINE void stepBackward(const difference_type delta) {
154155
const size_t remainingInRow = ptr - rowStart;
155-
if (remainingInRow < delta) {
156+
if (std::cmp_less(remainingInRow, delta)) {
156157
const size_t w = width();
157158
const size_t numRows = 1 + (delta - remainingInRow - 1) / w;
158159
const size_t rowPosition = 1 + (delta - remainingInRow - 1) % w;

examples/Gen1/cpp_samples/pointcloud_colorization/RGBPointCloudColorizer.h

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

2323
#include <boost/timer/progress_display.hpp>
2424
#include <unordered_map>
25+
#include <utility>
2526

2627
namespace {
2728

@@ -86,7 +87,7 @@ class RGBPointCloudColorizer : public PointCloudColorizer {
8687
{
8788
boost::timer::progress_display progressBar(
8889
numRgbData, std::cout, "Looping over VRS image frames and PointCloud observations.\n");
89-
for (int64_t frameId = 0; frameId < numRgbData; ++frameId) {
90+
for (int64_t frameId = 0; std::cmp_less(frameId, numRgbData); ++frameId) {
9091
++progressBar;
9192

9293
//

examples/Gen1/cpp_samples/pointcloud_colorization/SLAMPointCloudColorizer.h

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

2323
#include <boost/timer/progress_display.hpp>
2424
#include <unordered_map>
25+
#include <utility>
2526

2627
namespace {
2728
// Colorize a GlobalPointCloud given its SLAM image observations.
@@ -89,7 +90,7 @@ class SLAMPointCloudColorizer : public PointCloudColorizer {
8990
{
9091
boost::timer::progress_display progressBar(
9192
numSlamData, std::cout, "Looping over VRS image frames and PointCloud observations.\n");
92-
for (int64_t frameId = 0; frameId < numSlamData; ++frameId) {
93+
for (int64_t frameId = 0; std::cmp_less(frameId, numSlamData); ++frameId) {
9394
++progressBar;
9495

9596
//

tools/visualization/AriaPlayer.cpp

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

1919
#ifdef BUILD_INTERNAL_PROJECTARIA_TOOLS
2020
#include <data_provider/internal/VrsDataProvider.h>
21+
22+
#include <utility>
2123
#endif
2224

2325
using namespace projectaria::tools::data_provider;
@@ -82,7 +84,7 @@ void AriaPlayer::playStreamFromTimeNs(int64_t timestampNs, const vrs::StreamId&
8284

8385
int64_t playbackStartTime = timestampNs;
8486
auto systemStartTime = std::chrono::steady_clock::now();
85-
for (size_t i = startIndex; i < numData; ++i) {
87+
for (size_t i = startIndex; std::cmp_less(i, numData); ++i) {
8688
if (!visControl_->isPlaying_ || visControl_->shouldClose_) {
8789
return;
8890
}

tools/visualization/AriaVisualizationControlAndData.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "vrs/StreamId.h"
2020

2121
#include <chrono>
22+
#include <utility>
2223

2324
void AriaVisualizationData::initDataStreams(
2425
const std::vector<vrs::StreamId>& kImageStreamIds,
@@ -96,8 +97,8 @@ bool AriaVisualizationData::updateData(
9697
}
9798

9899
// Audio samples are 32bit; convert to float for visualization
99-
for (size_t i = 0; i < audioMatrix.rows(); ++i) {
100-
for (size_t c = 0; c < audioMatrix.cols(); ++c) {
100+
for (size_t i = 0; std::cmp_less(i, audioMatrix.rows()); ++i) {
101+
for (size_t c = 0; std::cmp_less(c, audioMatrix.cols()); ++c) {
101102
audio_[i][c] = static_cast<float>(audioMatrix(i, c) / maxAmplitude);
102103
}
103104
}

0 commit comments

Comments
 (0)