Merge remote-tracking branch 'origin/main' into tile-join-sqlite

This commit is contained in:
Erica Fischer
2024-12-17 15:23:01 -08:00
11 changed files with 136 additions and 67 deletions
+2 -1
View File
@@ -43,6 +43,7 @@
#include "errors.hpp"
#include "geometry.hpp"
#include "thread.hpp"
#include "platform.hpp"
int pk = false;
int pC = false;
@@ -1325,7 +1326,7 @@ int main(int argc, char **argv) {
struct tileset_reader *readers = NULL;
CPUS = sysconf(_SC_NPROCESSORS_ONLN);
CPUS = get_num_avail_cpus();
const char *TIPPECANOE_MAX_THREADS = getenv("TIPPECANOE_MAX_THREADS");
if (TIPPECANOE_MAX_THREADS != NULL) {