|
39 | 39 |
|
40 | 40 | #include "grid_map_geo/grid_map_geo.hpp"
|
41 | 41 |
|
| 42 | +#include <array> |
42 | 43 | #include <grid_map_core/GridMapMath.hpp>
|
43 | 44 | #include <grid_map_core/iterators/CircleIterator.hpp>
|
44 | 45 | #include <grid_map_core/iterators/GridMapIterator.hpp>
|
@@ -66,8 +67,8 @@ bool GridMapGeo::initializeFromGeotiff(const std::string &path, bool align_terra
|
66 | 67 | std::cout << std::endl << "Loading GeoTIFF file for gridmap" << std::endl;
|
67 | 68 |
|
68 | 69 | double originX, originY, pixelSizeX, pixelSizeY;
|
69 |
| - double geoTransform[6]; |
70 |
| - if (dataset->GetGeoTransform(geoTransform) == CE_None) { |
| 70 | + std::array<double, 6> geoTransform; |
| 71 | + if (dataset->GetGeoTransform(geoTransform.data()) == CE_None) { |
71 | 72 | originX = geoTransform[0];
|
72 | 73 | originY = geoTransform[3];
|
73 | 74 | pixelSizeX = geoTransform[1];
|
@@ -164,8 +165,8 @@ bool GridMapGeo::addColorFromGeotiff(const std::string &path) {
|
164 | 165 | std::cout << std::endl << "Loading color layer from GeoTIFF file for gridmap" << std::endl;
|
165 | 166 |
|
166 | 167 | double originX, originY, pixelSizeX, pixelSizeY;
|
167 |
| - double geoTransform[6]; |
168 |
| - if (dataset->GetGeoTransform(geoTransform) == CE_None) { |
| 168 | + std::array<double, 6> geoTransform; |
| 169 | + if (dataset->GetGeoTransform(geoTransform.data()) == CE_None) { |
169 | 170 | originX = geoTransform[0];
|
170 | 171 | originY = geoTransform[3];
|
171 | 172 | pixelSizeX = geoTransform[1];
|
@@ -225,8 +226,8 @@ bool GridMapGeo::addLayerFromGeotiff(const std::string &layer_name, const std::s
|
225 | 226 | std::cout << std::endl << "Loading color layer from GeoTIFF file for gridmap" << std::endl;
|
226 | 227 |
|
227 | 228 | double originX, originY, pixelSizeX, pixelSizeY;
|
228 |
| - double geoTransform[6]; |
229 |
| - if (dataset->GetGeoTransform(geoTransform) == CE_None) { |
| 229 | + std::array<double, 6> geoTransform; |
| 230 | + if (dataset->GetGeoTransform(geoTransform.data()) == CE_None) { |
230 | 231 | originX = geoTransform[0];
|
231 | 232 | originY = geoTransform[3];
|
232 | 233 | pixelSizeX = geoTransform[1];
|
|
0 commit comments