changed to create a vector

This commit is contained in:
esther 2024-04-29 15:02:50 +02:00
parent 33dd409c43
commit d046e18c43
1 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@
#include <gdal/gdal_frmts.h>
#include <omp.h>
CellMap produce_cellmap(HeightMap* heightmap, float z)
std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
{
int length = (heightmap->width-1)*(heightmap->height-1);
uint8_t *cells = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
@ -27,24 +27,24 @@ CellMap produce_cellmap(HeightMap* heightmap, float z)
(heightmap->get_pixel(x,y+1)>z)*8;
if (result != 0 and result != 15 ) {
points.push_back(Point(x, y, result));
};
}
return CellMap(heightmap->width-1, heightmap->height-1, cells, heightmap->reference_system, heightmap->geotransform);
return points;
}
std::vector<CellMap> vector_cellmap(HeightMap* heightmap, int interval)
std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interval)
{
int num_contours = (heightmap->max - heightmap->min)/interval;
std::vector<CellMap> vector_contours;
std::vector<std::vector<Point>> vector_contours;
omp_set_num_threads(12);
#pragma omp parallel
{
std::vector<CellMap> vec_private;
std::vector<std::vector<Point>> vec_private;
#pragma omp for
for (int i = 1; i <= num_contours; i++)
{