Skip to content

Commit ed78d68

Browse files
fspindlefspindle
committed
Introduce new quality rules fixes
1 parent 7254ec5 commit ed78d68

File tree

120 files changed

+3893
-3440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+3893
-3440
lines changed

‎modules/core/include/visp3/core/vpArray2D.h

+30-30
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
* a[1][0] = 4; a[1][1] = 5.5; a[1][2] = 6;
7979
*
8080
* std::cout << "a:" << std::endl;
81-
* for (unsigned int i = 0; i < a.getRows(); i++) {
82-
* for (unsigned int j = 0; j < a.getCols(); j++) {
81+
* for (unsigned int i = 0; i < a.getRows(); ++i) {
82+
* for (unsigned int j = 0; j < a.getCols(); ++j) {
8383
* std::cout << a[i][j] << " ";
8484
* }
8585
* std::cout << std::endl;
@@ -475,7 +475,7 @@ template <class Type> class vpArray2D
475475
memcpy(data + r * colNum, A.data, sizeof(Type) * A.size());
476476
}
477477
else if (data != nullptr && A.data != nullptr && A.data != data) {
478-
for (unsigned int i = r; i < (r + A.getRows()); i++) {
478+
for (unsigned int i = r; i < (r + A.getRows()); ++i) {
479479
memcpy(data + i * colNum + c, A.data + (i - r) * A.colNum, sizeof(Type) * A.colNum);
480480
}
481481
}
@@ -592,8 +592,8 @@ template <class Type> class vpArray2D
592592
std::ios_base::fmtflags original_flags = s.flags();
593593

594594
s.precision(10);
595-
for (unsigned int i = 0; i < A.getRows(); i++) {
596-
for (unsigned int j = 0; j < A.getCols() - 1; j++) {
595+
for (unsigned int i = 0; i < A.getRows(); ++i) {
596+
for (unsigned int j = 0; j < A.getCols() - 1; ++j) {
597597
s << A[i][j] << " ";
598598
}
599599
// We don't add " " after the last row element
@@ -698,8 +698,8 @@ template <class Type> class vpArray2D
698698
A.resize(rows, cols);
699699

700700
Type value;
701-
for (unsigned int i = 0; i < rows; i++) {
702-
for (unsigned int j = 0; j < cols; j++) {
701+
for (unsigned int i = 0; i < rows; ++i) {
702+
for (unsigned int j = 0; j < cols; ++j) {
703703
file >> value;
704704
A[i][j] = value;
705705
}
@@ -728,8 +728,8 @@ template <class Type> class vpArray2D
728728
A.resize(rows, cols);
729729

730730
Type value;
731-
for (unsigned int i = 0; i < rows; i++) {
732-
for (unsigned int j = 0; j < cols; j++) {
731+
for (unsigned int i = 0; i < rows; ++i) {
732+
for (unsigned int j = 0; j < cols; ++j) {
733733
file.read((char *)&value, sizeof(Type));
734734
A[i][j] = value;
735735
}
@@ -881,8 +881,8 @@ template <class Type> class vpArray2D
881881
matrixSize = A.getCols();
882882
file.write((char *)&matrixSize, sizeof(unsigned int));
883883
Type value;
884-
for (unsigned int i = 0; i < A.getRows(); i++) {
885-
for (unsigned int j = 0; j < A.getCols(); j++) {
884+
for (unsigned int i = 0; i < A.getRows(); ++i) {
885+
for (unsigned int j = 0; j < A.getCols(); ++j) {
886886
value = A[i][j];
887887
file.write((char *)&value, sizeof(Type));
888888
}
@@ -1068,7 +1068,7 @@ template <class Type> Type vpArray2D<Type>::getMinValue() const
10681068
Type *dataptr = data;
10691069
Type min = *dataptr;
10701070
dataptr++;
1071-
for (unsigned int i = 0; i < dsize - 1; i++) {
1071+
for (unsigned int i = 0; i < dsize - 1; ++i) {
10721072
if (*dataptr < min) {
10731073
min = *dataptr;
10741074
}
@@ -1085,7 +1085,7 @@ template <class Type> Type vpArray2D<Type>::getMaxValue() const
10851085
Type *dataptr = data;
10861086
Type max = *dataptr;
10871087
dataptr++;
1088-
for (unsigned int i = 0; i < dsize - 1; i++) {
1088+
for (unsigned int i = 0; i < dsize - 1; ++i) {
10891089
if (*dataptr > max) {
10901090
max = *dataptr;
10911091
}
@@ -1109,7 +1109,7 @@ template <class Type> vpArray2D<Type> vpArray2D<Type>::hadamard(const vpArray2D<
11091109
vpArray2D<Type> out;
11101110
out.resize(rowNum, colNum, false);
11111111

1112-
for (unsigned int i = 0; i < dsize; i++) {
1112+
for (unsigned int i = 0; i < dsize; ++i) {
11131113
out.data[i] = data[i] * m.data[i];
11141114
}
11151115

@@ -1119,8 +1119,8 @@ template <class Type> vpArray2D<Type> vpArray2D<Type>::hadamard(const vpArray2D<
11191119
template <class Type> vpArray2D<Type> vpArray2D<Type>::t() const
11201120
{
11211121
vpArray2D<Type> At(colNum, rowNum);
1122-
for (unsigned int i = 0; i < rowNum; i++) {
1123-
for (unsigned int j = 0; j < colNum; j++) {
1122+
for (unsigned int i = 0; i < rowNum; ++i) {
1123+
for (unsigned int j = 0; j < colNum; ++j) {
11241124
At[j][i] = (*this)[i][j];
11251125
}
11261126
}
@@ -1169,10 +1169,10 @@ template <class Type> void vpArray2D<Type>::conv2(const vpArray2D<Type> &M, cons
11691169
}
11701170

11711171
if (mode == "same") {
1172-
for (unsigned int i = 0; i < res_same.getRows(); i++) {
1173-
for (unsigned int j = 0; j < res_same.getCols(); j++) {
1174-
for (unsigned int k = 0; k < kernel.getRows(); k++) {
1175-
for (unsigned int l = 0; l < kernel.getCols(); l++) {
1172+
for (unsigned int i = 0; i < res_same.getRows(); ++i) {
1173+
for (unsigned int j = 0; j < res_same.getCols(); ++j) {
1174+
for (unsigned int k = 0; k < kernel.getRows(); ++k) {
1175+
for (unsigned int l = 0; l < kernel.getCols(); ++l) {
11761176
res_same[i][j] += M_padded[i + k][j + l] * kernel[kernel.getRows() - k - 1][kernel.getCols() - l - 1];
11771177
}
11781178
}
@@ -1181,16 +1181,16 @@ template <class Type> void vpArray2D<Type>::conv2(const vpArray2D<Type> &M, cons
11811181

11821182
const unsigned int start_i = kernel.getRows() / 2;
11831183
const unsigned int start_j = kernel.getCols() / 2;
1184-
for (unsigned int i = 0; i < M.getRows(); i++) {
1184+
for (unsigned int i = 0; i < M.getRows(); ++i) {
11851185
memcpy(res.data + i * M.getCols(), res_same.data + (i + start_i) * res_same.getCols() + start_j,
11861186
sizeof(Type) * M.getCols());
11871187
}
11881188
}
11891189
else {
1190-
for (unsigned int i = 0; i < res.getRows(); i++) {
1191-
for (unsigned int j = 0; j < res.getCols(); j++) {
1192-
for (unsigned int k = 0; k < kernel.getRows(); k++) {
1193-
for (unsigned int l = 0; l < kernel.getCols(); l++) {
1190+
for (unsigned int i = 0; i < res.getRows(); ++i) {
1191+
for (unsigned int j = 0; j < res.getCols(); ++j) {
1192+
for (unsigned int k = 0; k < kernel.getRows(); ++k) {
1193+
for (unsigned int l = 0; l < kernel.getCols(); ++l) {
11941194
res[i][j] += M_padded[i + k][j + l] * kernel[kernel.getRows() - k - 1][kernel.getCols() - l - 1];
11951195
}
11961196
}
@@ -1213,8 +1213,8 @@ template<class Type> void vpArray2D<Type>::insert(const vpArray2D<Type> &A, cons
12131213
if (((r + B.getRows()) <= A.getRows()) && ((c + B.getCols()) <= A.getCols())) {
12141214
C.resize(A.getRows(), A.getCols(), false, false);
12151215

1216-
for (unsigned int i = 0; i < A.getRows(); i++) {
1217-
for (unsigned int j = 0; j < A.getCols(); j++) {
1216+
for (unsigned int i = 0; i < A.getRows(); ++i) {
1217+
for (unsigned int j = 0; j < A.getCols(); ++j) {
12181218
if (i >= r && i < (r + B.getRows()) && j >= c && j < (c + B.getCols())) {
12191219
C[i][j] = B[i - r][j - c];
12201220
}
@@ -1236,7 +1236,7 @@ template <class Type> bool vpArray2D<Type>::operator==(const vpArray2D<Type> &A)
12361236
return false;
12371237
}
12381238

1239-
for (unsigned int i = 0; i < A.size(); i++) {
1239+
for (unsigned int i = 0; i < A.size(); ++i) {
12401240
if (data[i] != A.data[i]) {
12411241
return false;
12421242
}
@@ -1254,7 +1254,7 @@ template <> inline bool vpArray2D<double>::operator==(const vpArray2D<double> &A
12541254
return false;
12551255
}
12561256

1257-
for (unsigned int i = 0; i < A.size(); i++) {
1257+
for (unsigned int i = 0; i < A.size(); ++i) {
12581258
if (fabs(data[i] - A.data[i]) > std::numeric_limits<double>::epsilon()) {
12591259
return false;
12601260
}
@@ -1272,7 +1272,7 @@ template <> inline bool vpArray2D<float>::operator==(const vpArray2D<float> &A)
12721272
return false;
12731273
}
12741274

1275-
for (unsigned int i = 0; i < A.size(); i++) {
1275+
for (unsigned int i = 0; i < A.size(); ++i) {
12761276
if (fabsf(data[i] - A.data[i]) > std::numeric_limits<float>::epsilon()) {
12771277
return false;
12781278
}

‎modules/core/include/visp3/core/vpColVector.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class vpPoseVector;
7474
* v[0] = -1; v[1] = -2.1; v[2] = -3;
7575
*
7676
* std::cout << "v:" << std::endl;
77-
* for (unsigned int i = 0; i < v.size(); i++) {
77+
* for (unsigned int i = 0; i < v.size(); ++i) {
7878
* std::cout << v[i] << std::endl;
7979
* }
8080
* }
@@ -288,7 +288,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
288288
* int main()
289289
* {
290290
* vpColVector v(3);
291-
* for (unsigned int i=0; i<v.size(); i++)
291+
* for (unsigned int i=0; i<v.size(); ++i)
292292
* v[i] = i;
293293
* v.cppPrint(std::cout, "v");
294294
* }
@@ -316,7 +316,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
316316
* {
317317
* std::ofstream ofs("log.csv", std::ofstream::out);
318318
* vpColVector v(3);
319-
* for (unsigned int i=0; i<v.size(); i++)
319+
* for (unsigned int i=0; i<v.size(); ++i)
320320
* v[i] = i;
321321
*
322322
* v.csvPrint(ofs);
@@ -357,7 +357,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
357357
*
358358
* \code
359359
* vpColVector v1;
360-
* for (unsigned int i=0; i<4; i++)
360+
* for (unsigned int i=0; i<4; ++i)
361361
* v1.stack(i);
362362
* // v1 is equal to [0 1 2 3]^T
363363
* vpColVector v2 = v1.extract(1, 3);
@@ -429,7 +429,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
429429
* {
430430
* vpColVector v(4);
431431
* int val = 0;
432-
* for(size_t i=0; i<v.getRows(); i++) {
432+
* for(size_t i=0; i<v.getRows(); ++i) {
433433
* v[i] = val++;
434434
* }
435435
* std::cout << "v: " << v.t() << std::endl;
@@ -459,12 +459,12 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
459459
* int main()
460460
* {
461461
* vpColVector v(4);
462-
* for (unsigned int i=0; i < v.size(); i++)
462+
* for (unsigned int i=0; i < v.size(); ++i)
463463
* v[i] = i;
464464
* std::cout << "v: " << v.t() << std::endl;
465465
*
466466
* vpColVector w(2);
467-
* for (unsigned int i=0; i < w.size(); i++)
467+
* for (unsigned int i=0; i < w.size(); ++i)
468468
* w[i] = i+10;
469469
* std::cout << "w: " << w.t() << std::endl;
470470
*
@@ -491,7 +491,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
491491
* int main()
492492
* {
493493
* vpColVector v(3);
494-
* for (unsigned int i=0; i<v.size(); i++)
494+
* for (unsigned int i=0; i<v.size(); ++i)
495495
* v[i] = i;
496496
* std::cout << "v = "; v.maplePrint(std::cout);
497497
* }
@@ -520,7 +520,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
520520
* int main()
521521
* {
522522
* vpColVector v(3);
523-
* for (unsigned int i=0; i<v.size(); i++)
523+
* for (unsigned int i=0; i<v.size(); ++i)
524524
* v[i] = i;
525525
* std::cout << "v = "; v.matlabPrint(std::cout);
526526
* }
@@ -862,7 +862,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
862862
* int main()
863863
* {
864864
* vpColVector A, B(5);
865-
* for (unsigned int i=0; i<B.size(); i++)
865+
* for (unsigned int i=0; i<B.size(); ++i)
866866
* B[i] = i;
867867
* A << B;
868868
* std::cout << "A: " << A.t() << std::endl;
@@ -887,7 +887,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
887887
* size_t n = 5;
888888
* vpColVector A(n);
889889
* double *B = new double [n];
890-
* for (unsigned int i = 0; i < n; i++)
890+
* for (unsigned int i = 0; i < n; ++i)
891891
* B[i] = i;
892892
* A << B;
893893
* std::cout << "A: " << A.t() << std::endl;
@@ -993,8 +993,8 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
993993
* {
994994
* int var=0;
995995
* vpMatrix mat(3, 4);
996-
* for (int i = 0; i < 3; i++)
997-
* for (int j = 0; j < 4; j++)
996+
* for (int i = 0; i < 3; ++i)
997+
* for (int j = 0; j < 4; ++j)
998998
* mat[i][j] = ++var;
999999
* std::cout << "mat: \n" << mat << std::endl;
10001000
*
@@ -1369,12 +1369,12 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
13691369
* int main()
13701370
* {
13711371
* vpColVector v(4);
1372-
* for (unsigned int i=0; i < v.size(); i++)
1372+
* for (unsigned int i=0; i < v.size(); ++i)
13731373
* v[i] = i;
13741374
* std::cout << "v: " << v.t() << std::endl;
13751375
*
13761376
* vpColVector w(2);
1377-
* for (unsigned int i=0; i < w.size(); i++)
1377+
* for (unsigned int i=0; i < w.size(); ++i)
13781378
* w[i] = i+10;
13791379
* std::cout << "w: " << w.t() << std::endl;
13801380
*

‎modules/core/include/visp3/core/vpDisplay.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
* std::cout << "Check keyboard events..." << std::endl;
144144
* char key[10]; sprintf(key, "\0");
145145
* bool ret;
146-
* for (int i=0; i< 200; i++) {
146+
* for (int i=0; i< 200; ++i) {
147147
* bool ret = vpDisplay::getKeyboardEvent(I, key, false);
148148
* if (ret)
149149
* std::cout << "keyboard event: key: " << "\"" << key

0 commit comments

Comments
 (0)