Skip to content

Commit f7ba9b3

Browse files
lovettchrislovettchris
committed
clang-format-11 fixes
1 parent 0edf734 commit f7ba9b3

File tree

15 files changed

+956
-338
lines changed

15 files changed

+956
-338
lines changed

‎AirLib/include/common/EarthUtils.hpp

+15-16
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,21 @@ namespace airlib
2424
static constexpr int MAG_SAMPLING_MIN_LON = -180;
2525
static constexpr int MAG_SAMPLING_MAX_LON = 180;
2626

27-
static constexpr int DECLINATION_TABLE[13][37] =
28-
{
29-
{ 46, 45, 44, 42, 41, 40, 38, 36, 33, 28, 23, 16, 10, 4, -1, -5, -9, -14, -19, -26, -33, -40, -48, -55, -61, -66, -71, -74, -75, -72, -61, -25, 22, 40, 45, 47, 46 },
30-
{ 30, 30, 30, 30, 29, 29, 29, 29, 27, 24, 18, 11, 3, -3, -9, -12, -15, -17, -21, -26, -32, -39, -45, -51, -55, -57, -56, -53, -44, -31, -14, 0, 13, 21, 26, 29, 30 },
31-
{ 21, 22, 22, 22, 22, 22, 22, 22, 21, 18, 13, 5, -3, -11, -17, -20, -21, -22, -23, -25, -29, -35, -40, -44, -45, -44, -40, -32, -22, -12, -3, 3, 9, 14, 18, 20, 21 },
32-
{ 16, 17, 17, 17, 17, 17, 16, 16, 16, 13, 8, 0, -9, -16, -21, -24, -25, -25, -23, -20, -21, -24, -28, -31, -31, -29, -24, -17, -9, -3, 0, 4, 7, 10, 13, 15, 16 },
33-
{ 12, 13, 13, 13, 13, 13, 12, 12, 11, 9, 3, -4, -12, -19, -23, -24, -24, -22, -17, -12, -9, -10, -13, -17, -18, -16, -13, -8, -3, 0, 1, 3, 6, 8, 10, 12, 12 },
34-
{ 10, 10, 10, 10, 10, 10, 10, 9, 9, 6, 0, -6, -14, -20, -22, -22, -19, -15, -10, -6, -2, -2, -4, -7, -8, -8, -7, -4, 0, 1, 1, 2, 4, 6, 8, 10, 10 },
35-
{ 9, 9, 9, 9, 9, 9, 8, 8, 7, 4, -1, -8, -15, -19, -20, -18, -14, -9, -5, -2, 0, 1, 0, -2, -3, -4, -3, -2, 0, 0, 0, 1, 3, 5, 7, 8, 9 },
36-
{ 8, 8, 8, 9, 9, 9, 8, 8, 6, 2, -3, -9, -15, -18, -17, -14, -10, -6, -2, 0, 1, 2, 2, 0, -1, -1, -2, -1, 0, 0, 0, 0, 1, 3, 5, 7, 8 },
37-
{ 8, 9, 9, 10, 10, 10, 10, 8, 5, 0, -5, -11, -15, -16, -15, -12, -8, -4, -1, 0, 2, 3, 2, 1, 0, 0, 0, 0, 0, -1, -2, -2, -1, 0, 3, 6, 8 },
38-
{ 6, 9, 10, 11, 12, 12, 11, 9, 5, 0, -7, -12, -15, -15, -13, -10, -7, -3, 0, 1, 2, 3, 3, 3, 2, 1, 0, 0, -1, -3, -4, -5, -5, -2, 0, 3, 6 },
39-
{ 5, 8, 11, 13, 15, 15, 14, 11, 5, -1, -9, -14, -17, -16, -14, -11, -7, -3, 0, 1, 3, 4, 5, 5, 5, 4, 3, 1, -1, -4, -7, -8, -8, -6, -2, 1, 5 },
40-
{ 4, 8, 12, 15, 17, 18, 16, 12, 5, -3, -12, -18, -20, -19, -16, -13, -8, -4, -1, 1, 4, 6, 8, 9, 9, 9, 7, 3, -1, -6, -10, -12, -11, -9, -5, 0, 4 },
41-
{ 3, 9, 14, 17, 20, 21, 19, 14, 4, -8, -19, -25, -26, -25, -21, -17, -12, -7, -2, 1, 5, 9, 13, 15, 16, 16, 13, 7, 0, -7, -12, -15, -14, -11, -6, -1, 3 },
42-
};
27+
static constexpr int DECLINATION_TABLE[13][37] = {
28+
{ 46, 45, 44, 42, 41, 40, 38, 36, 33, 28, 23, 16, 10, 4, -1, -5, -9, -14, -19, -26, -33, -40, -48, -55, -61, -66, -71, -74, -75, -72, -61, -25, 22, 40, 45, 47, 46 },
29+
{ 30, 30, 30, 30, 29, 29, 29, 29, 27, 24, 18, 11, 3, -3, -9, -12, -15, -17, -21, -26, -32, -39, -45, -51, -55, -57, -56, -53, -44, -31, -14, 0, 13, 21, 26, 29, 30 },
30+
{ 21, 22, 22, 22, 22, 22, 22, 22, 21, 18, 13, 5, -3, -11, -17, -20, -21, -22, -23, -25, -29, -35, -40, -44, -45, -44, -40, -32, -22, -12, -3, 3, 9, 14, 18, 20, 21 },
31+
{ 16, 17, 17, 17, 17, 17, 16, 16, 16, 13, 8, 0, -9, -16, -21, -24, -25, -25, -23, -20, -21, -24, -28, -31, -31, -29, -24, -17, -9, -3, 0, 4, 7, 10, 13, 15, 16 },
32+
{ 12, 13, 13, 13, 13, 13, 12, 12, 11, 9, 3, -4, -12, -19, -23, -24, -24, -22, -17, -12, -9, -10, -13, -17, -18, -16, -13, -8, -3, 0, 1, 3, 6, 8, 10, 12, 12 },
33+
{ 10, 10, 10, 10, 10, 10, 10, 9, 9, 6, 0, -6, -14, -20, -22, -22, -19, -15, -10, -6, -2, -2, -4, -7, -8, -8, -7, -4, 0, 1, 1, 2, 4, 6, 8, 10, 10 },
34+
{ 9, 9, 9, 9, 9, 9, 8, 8, 7, 4, -1, -8, -15, -19, -20, -18, -14, -9, -5, -2, 0, 1, 0, -2, -3, -4, -3, -2, 0, 0, 0, 1, 3, 5, 7, 8, 9 },
35+
{ 8, 8, 8, 9, 9, 9, 8, 8, 6, 2, -3, -9, -15, -18, -17, -14, -10, -6, -2, 0, 1, 2, 2, 0, -1, -1, -2, -1, 0, 0, 0, 0, 1, 3, 5, 7, 8 },
36+
{ 8, 9, 9, 10, 10, 10, 10, 8, 5, 0, -5, -11, -15, -16, -15, -12, -8, -4, -1, 0, 2, 3, 2, 1, 0, 0, 0, 0, 0, -1, -2, -2, -1, 0, 3, 6, 8 },
37+
{ 6, 9, 10, 11, 12, 12, 11, 9, 5, 0, -7, -12, -15, -15, -13, -10, -7, -3, 0, 1, 2, 3, 3, 3, 2, 1, 0, 0, -1, -3, -4, -5, -5, -2, 0, 3, 6 },
38+
{ 5, 8, 11, 13, 15, 15, 14, 11, 5, -1, -9, -14, -17, -16, -14, -11, -7, -3, 0, 1, 3, 4, 5, 5, 5, 4, 3, 1, -1, -4, -7, -8, -8, -6, -2, 1, 5 },
39+
{ 4, 8, 12, 15, 17, 18, 16, 12, 5, -3, -12, -18, -20, -19, -16, -13, -8, -4, -1, 1, 4, 6, 8, 9, 9, 9, 7, 3, -1, -6, -10, -12, -11, -9, -5, 0, 4 },
40+
{ 3, 9, 14, 17, 20, 21, 19, 14, 4, -8, -19, -25, -26, -25, -21, -17, -12, -7, -2, 1, 5, 9, 13, 15, 16, 16, 13, 7, 0, -7, -12, -15, -14, -11, -6, -1, 3 },
41+
};
4342

4443
public:
4544
//return declination in degrees

‎AirLib/include/common/common_utils/bitmap_image.hpp

+19-18
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ namespace bmp
523523

524524
inline void invert_color_planes()
525525
{
526-
for (unsigned char *itr = data(); itr < end(); *itr = ~(*itr), ++itr)
526+
for (unsigned char* itr = data(); itr < end(); *itr = ~(*itr), ++itr)
527527
;
528528
}
529529

@@ -634,7 +634,7 @@ namespace bmp
634634

635635
inline void export_color_plane(const color_plane color, unsigned char* image)
636636
{
637-
for (unsigned char *itr = (data() + offset(color)); itr < end(); ++image, itr += bytes_per_pixel_) {
637+
for (unsigned char* itr = (data() + offset(color)); itr < end(); ++image, itr += bytes_per_pixel_) {
638638
(*image) = (*itr);
639639
}
640640
}
@@ -665,7 +665,7 @@ namespace bmp
665665
{
666666
double* resp_itr = response_image;
667667

668-
for (unsigned char *itr = (data() + offset(color)); itr < end(); ++response_image, itr += bytes_per_pixel_) {
668+
for (unsigned char* itr = (data() + offset(color)); itr < end(); ++response_image, itr += bytes_per_pixel_) {
669669
*(resp_itr++) = (1.0 * (*itr)) / 256.0;
670670
}
671671
}
@@ -689,7 +689,7 @@ namespace bmp
689689
if (bgr_mode != channel_mode_)
690690
return;
691691

692-
for (const unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
692+
for (const unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
693693
(*blue) = (1.0 * (*(itr++))) / 256.0;
694694
(*green) = (1.0 * (*(itr++))) / 256.0;
695695
(*red) = (1.0 * (*(itr++))) / 256.0;
@@ -701,7 +701,7 @@ namespace bmp
701701
if (bgr_mode != channel_mode_)
702702
return;
703703

704-
for (const unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
704+
for (const unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
705705
(*blue) = (1.0f * (*(itr++))) / 256.0f;
706706
(*green) = (1.0f * (*(itr++))) / 256.0f;
707707
(*red) = (1.0f * (*(itr++))) / 256.0f;
@@ -713,7 +713,7 @@ namespace bmp
713713
if (bgr_mode != channel_mode_)
714714
return;
715715

716-
for (const unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
716+
for (const unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
717717
(*blue) = *(itr++);
718718
(*green) = *(itr++);
719719
(*red) = *(itr++);
@@ -725,7 +725,7 @@ namespace bmp
725725
if (bgr_mode != channel_mode_)
726726
return;
727727

728-
for (const unsigned char *itr = data(); itr < end(); ++y, ++cb, ++cr) {
728+
for (const unsigned char* itr = data(); itr < end(); ++y, ++cb, ++cr) {
729729
const double blue = (1.0 * (*(itr++)));
730730
const double green = (1.0 * (*(itr++)));
731731
const double red = (1.0 * (*(itr++)));
@@ -741,7 +741,7 @@ namespace bmp
741741
if (bgr_mode != channel_mode_)
742742
return;
743743

744-
for (const unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
744+
for (const unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
745745
(*blue) = (1.0 * (*(itr++)));
746746
(*green) = (1.0 * (*(itr++)));
747747
(*red) = (1.0 * (*(itr++)));
@@ -753,7 +753,7 @@ namespace bmp
753753
if (bgr_mode != channel_mode_)
754754
return;
755755

756-
for (const unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
756+
for (const unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
757757
(*blue) = (1.0f * (*(itr++)));
758758
(*green) = (1.0f * (*(itr++)));
759759
(*red) = (1.0f * (*(itr++)));
@@ -765,7 +765,7 @@ namespace bmp
765765
if (bgr_mode != channel_mode_)
766766
return;
767767

768-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
768+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
769769
*(itr++) = static_cast<unsigned char>(256.0 * (*blue));
770770
*(itr++) = static_cast<unsigned char>(256.0 * (*green));
771771
*(itr++) = static_cast<unsigned char>(256.0 * (*red));
@@ -777,7 +777,7 @@ namespace bmp
777777
if (bgr_mode != channel_mode_)
778778
return;
779779

780-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
780+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
781781
*(itr++) = static_cast<unsigned char>(256.0f * (*blue));
782782
*(itr++) = static_cast<unsigned char>(256.0f * (*green));
783783
*(itr++) = static_cast<unsigned char>(256.0f * (*red));
@@ -789,7 +789,7 @@ namespace bmp
789789
if (bgr_mode != channel_mode_)
790790
return;
791791

792-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
792+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
793793
*(itr++) = (*blue);
794794
*(itr++) = (*green);
795795
*(itr++) = (*red);
@@ -801,7 +801,7 @@ namespace bmp
801801
if (bgr_mode != channel_mode_)
802802
return;
803803

804-
for (unsigned char *itr = data(); itr < end(); ++y, ++cb, ++cr) {
804+
for (unsigned char* itr = data(); itr < end(); ++y, ++cb, ++cr) {
805805
double y_ = (*y);
806806
double cb_ = (*cb);
807807
double cr_ = (*cr);
@@ -833,7 +833,7 @@ namespace bmp
833833
if (bgr_mode != channel_mode_)
834834
return;
835835

836-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
836+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
837837
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0 * (*blue), 0.0, 255.0));
838838
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0 * (*green), 0.0, 255.0));
839839
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0 * (*red), 0.0, 255.0));
@@ -845,7 +845,7 @@ namespace bmp
845845
if (bgr_mode != channel_mode_)
846846
return;
847847

848-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
848+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
849849
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0f * (*blue), 0.0, 255.0));
850850
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0f * (*green), 0.0, 255.0));
851851
*(itr++) = static_cast<unsigned char>(clamp<double>(256.0f * (*red), 0.0, 255.0));
@@ -857,7 +857,7 @@ namespace bmp
857857
if (bgr_mode != channel_mode_)
858858
return;
859859

860-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
860+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
861861
*(itr++) = static_cast<unsigned char>(*blue);
862862
*(itr++) = static_cast<unsigned char>(*green);
863863
*(itr++) = static_cast<unsigned char>(*red);
@@ -869,7 +869,7 @@ namespace bmp
869869
if (bgr_mode != channel_mode_)
870870
return;
871871

872-
for (unsigned char *itr = data(); itr < end(); ++red, ++green, ++blue) {
872+
for (unsigned char* itr = data(); itr < end(); ++red, ++green, ++blue) {
873873
*(itr++) = static_cast<unsigned char>(*blue);
874874
*(itr++) = static_cast<unsigned char>(*green);
875875
*(itr++) = static_cast<unsigned char>(*red);
@@ -1598,7 +1598,8 @@ namespace bmp
15981598
for (std::size_t x = 0; x < resp_image.width(); ++x) {
15991599
const double v = resp_image(x, y);
16001600

1601-
unsigned int index = static_cast<unsigned int>((v < 0) ? 0 : v > (palette.size()) ? (palette.size() - 1) : v);
1601+
unsigned int index = static_cast<unsigned int>((v < 0) ? 0 : v > (palette.size()) ? (palette.size() - 1)
1602+
: v);
16021603

16031604
image.set_pixel(x, y, palette[index]);
16041605
}

0 commit comments

Comments
 (0)