mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 10:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format on c++ code

Browse Source
This commit is contained in:
Brandon Liu
2022-11-30 10:56:24 +08:00
parent 36a4d31aa8
commit 2e11a7cd2a
3 changed files with 336 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpp/Makefile
View File

@@ -1,3 +1,6 @@
.PHONY: test .PHONY: test
test: test:
clang test.cpp -std=c++11 -lstdc++ -o test && ./test clang test.cpp -std=c++11 -lstdc++ -o test && ./test
indent:
clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" pmtiles.hpp test.cpp

71
cpp/pmtiles.hpp
View File

@@ -130,7 +130,8 @@ struct zxy {
uint32_t x; uint32_t x;
uint32_t y; uint32_t y;
zxy(int _z, int _x, int _y) : z(_z), x(_x), y(_y) { zxy(int _z, int _x, int _y)
: z(_z), x(_x), y(_y) {
} }
}; };
@@ -140,7 +141,8 @@ struct entryv3 {
uint32_t length; uint32_t length;
uint32_t run_length; uint32_t run_length;
entryv3() : tile_id(0), offset(0), length(0), run_length(0) { entryv3()
: tile_id(0), offset(0), length(0), run_length(0) {
} }
entryv3(uint64_t _tile_id, uint64_t _offset, uint32_t _length, uint32_t _run_length) entryv3(uint64_t _tile_id, uint64_t _offset, uint32_t _length, uint32_t _run_length)
@@ -149,7 +151,9 @@ struct entryv3 {
}; };
struct { struct {
bool operator()(entryv3 a, entryv3 b) const { return a.tile_id < b.tile_id; } bool operator()(entryv3 a, entryv3 b) const {
return a.tile_id < b.tile_id;
}
} entryv3_cmp; } entryv3_cmp;
struct varint_too_long_exception : std::exception { struct varint_too_long_exception : std::exception {
@@ -177,16 +181,55 @@ namespace detail {
if (iend - begin >= max_varint_length) { // fast path if (iend - begin >= max_varint_length) { // fast path
do { do {
int64_t b = *p++; int64_t b = *p++;
val = ((uint64_t(b) & 0x7fU) ); if (b >= 0) { break; } val = ((uint64_t(b) & 0x7fU));
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 7U); if (b >= 0) { break; } if (b >= 0) {
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 14U); if (b >= 0) { break; } break;
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 21U); if (b >= 0) { break; } }
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 28U); if (b >= 0) { break; } b = *p++;
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 35U); if (b >= 0) { break; } val |= ((uint64_t(b) & 0x7fU) << 7U);
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 42U); if (b >= 0) { break; } if (b >= 0) {
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 49U); if (b >= 0) { break; } break;
b = *p++; val |= ((uint64_t(b) & 0x7fU) << 56U); if (b >= 0) { break; } }
b = *p++; val |= ((uint64_t(b) & 0x01U) << 63U); if (b >= 0) { break; } b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 14U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 21U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 28U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 35U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 42U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 49U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x7fU) << 56U);
if (b >= 0) {
break;
}
b = *p++;
val |= ((uint64_t(b) & 0x01U) << 63U);
if (b >= 0) {
break;
}
throw varint_too_long_exception{}; throw varint_too_long_exception{};
} while (false); } while (false);
} else { } else {
@@ -363,5 +406,5 @@ inline std::vector<entryv3> deserialize_directory(const std::string &decompresse
return result; return result;
} }
} } // namespace pmtiles
#endif #endif