Skip to content

Commit ea71232

Browse files
authored
Use std::array over raw array for transforms (#48)
Signed-off-by: Ryan Friedman <[email protected]>
1 parent 9674fdb commit ea71232

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/grid_map_geo.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
#include "grid_map_geo/grid_map_geo.hpp"
4141

42+
#include <array>
4243
#include <grid_map_core/GridMapMath.hpp>
4344
#include <grid_map_core/iterators/CircleIterator.hpp>
4445
#include <grid_map_core/iterators/GridMapIterator.hpp>
@@ -66,8 +67,8 @@ bool GridMapGeo::initializeFromGeotiff(const std::string &path, bool align_terra
6667
std::cout << std::endl << "Loading GeoTIFF file for gridmap" << std::endl;
6768

6869
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) {
7172
originX = geoTransform[0];
7273
originY = geoTransform[3];
7374
pixelSizeX = geoTransform[1];
@@ -164,8 +165,8 @@ bool GridMapGeo::addColorFromGeotiff(const std::string &path) {
164165
std::cout << std::endl << "Loading color layer from GeoTIFF file for gridmap" << std::endl;
165166

166167
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) {
169170
originX = geoTransform[0];
170171
originY = geoTransform[3];
171172
pixelSizeX = geoTransform[1];
@@ -225,8 +226,8 @@ bool GridMapGeo::addLayerFromGeotiff(const std::string &layer_name, const std::s
225226
std::cout << std::endl << "Loading color layer from GeoTIFF file for gridmap" << std::endl;
226227

227228
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) {
230231
originX = geoTransform[0];
231232
originY = geoTransform[3];
232233
pixelSizeX = geoTransform[1];

0 commit comments

Comments
 (0)