Reindent with clang-format (#3)

This commit is contained in:
Erica Fischer
2022-07-28 11:19:30 -07:00
committed by GitHub
parent e6ab02ddd3
commit 6978a0e102
11 changed files with 45 additions and 29 deletions
+6 -1
View File
@@ -16,7 +16,12 @@
// XXX duplicated
#define GEOM_TYPES 6
static const char *geometry_names[GEOM_TYPES] = {
"Point", "MultiPoint", "LineString", "MultiLineString", "Polygon", "MultiPolygon",
"Point",
"MultiPoint",
"LineString",
"MultiLineString",
"Polygon",
"MultiPolygon",
};
// XXX duplicated
+1 -1
View File
@@ -4,5 +4,5 @@
#include "json_logger.hpp"
void json_logger::progress_tile(double progress) {
fprintf(stderr,"{\"progress\":%3.1f}\n",progress);
fprintf(stderr, "{\"progress\":%3.1f}\n", progress);
}
-1
View File
@@ -3,7 +3,6 @@
#ifndef LOGGING_HPP
#define LOGGING_HPP
struct json_logger {
bool json_enabled = false;
+3 -1
View File
@@ -3258,7 +3258,9 @@ int main(int argc, char **argv) {
long long file_bbox[4] = {UINT_MAX, UINT_MAX, 0, 0};
ret = read_input(sources, name ? name : out_mbtiles ? out_mbtiles : out_dir, maxzoom, minzoom, basezoom, basezoom_marker_width, outdb, out_dir, &exclude, &include, exclude_all, filter, droprate, buffer, tmpdir, gamma, read_parallel, forcetable, attribution, gamma != 0, file_bbox, prefilter, postfilter, description, guess_maxzoom, &attribute_types, argv[0], &attribute_accum, attribute_descriptions, commandline);
ret = read_input(sources, name ? name : out_mbtiles ? out_mbtiles
: out_dir,
maxzoom, minzoom, basezoom, basezoom_marker_width, outdb, out_dir, &exclude, &include, exclude_all, filter, droprate, buffer, tmpdir, gamma, read_parallel, forcetable, attribution, gamma != 0, file_bbox, prefilter, postfilter, description, guess_maxzoom, &attribute_types, argv[0], &attribute_accum, attribute_descriptions, commandline);
if (outdb != NULL) {
mbtiles_close(outdb, argv[0]);
+12 -2
View File
@@ -14,7 +14,12 @@
#include "milo/dtoa_milo.h"
const char *geometry_names[GEOM_TYPES] = {
"Point", "MultiPoint", "LineString", "MultiLineString", "Polygon", "MultiPolygon",
"Point",
"MultiPoint",
"LineString",
"MultiLineString",
"Polygon",
"MultiPolygon",
};
int geometry_within[GEOM_TYPES] = {
@@ -27,7 +32,12 @@ int geometry_within[GEOM_TYPES] = {
};
int mb_geometry[GEOM_TYPES] = {
VT_POINT, VT_POINT, VT_LINE, VT_LINE, VT_POLYGON, VT_POLYGON,
VT_POINT,
VT_POINT,
VT_LINE,
VT_LINE,
VT_POLYGON,
VT_POLYGON,
};
void json_context(json_object *j) {