GDALDatasetPamInfo: use std::array<> for adfGeoTransform member (OSGe…

…o#10795)
OSGeo-jp · Sep 13, 2024 · daab6da · daab6da
1 parent acca3c2
commit daab6da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/gcore/gdal_pam.h b/gcore/gdal_pam.h
@@ -34,6 +34,7 @@
 
 #include "cpl_minixml.h"
 #include "gdal_priv.h"
+#include <array>
 #include <limits>
 #include <map>
 #include <vector>
@@ -95,7 +96,7 @@ class GDALDatasetPamInfo
     OGRSpatialReference *poSRS = nullptr;
 
     int bHaveGeoTransform = false;
-    double adfGeoTransform[6]{0, 0, 0, 0, 0, 0};
+    std::array<double, 6> adfGeoTransform{};
 
     std::vector<gdal::GCP> asGCPs{};
     OGRSpatialReference *poGCP_SRS = nullptr;

diff --git a/gcore/gdalpamdataset.cpp b/gcore/gdalpamdataset.cpp
@@ -1403,7 +1403,8 @@ CPLErr GDALPamDataset::GetGeoTransform(double *padfTransform)
 {
     if (psPam && psPam->bHaveGeoTransform)
     {
-        memcpy(padfTransform, psPam->adfGeoTransform, sizeof(double) * 6);
+        memcpy(padfTransform, psPam->adfGeoTransform.data(),
+               sizeof(psPam->adfGeoTransform));
         return CE_None;
     }
 
@@ -1423,7 +1424,8 @@ CPLErr GDALPamDataset::SetGeoTransform(double *padfTransform)
     {
         MarkPamDirty();
         psPam->bHaveGeoTransform = TRUE;
-        memcpy(psPam->adfGeoTransform, padfTransform, sizeof(double) * 6);
+        memcpy(psPam->adfGeoTransform.data(), padfTransform,
+               sizeof(psPam->adfGeoTransform));
         return (CE_None);
     }
 
@@ -1689,7 +1691,7 @@ CPLErr GDALPamDataset::TryLoadAux(CSLConstList papszSiblingFiles)
     /* -------------------------------------------------------------------- */
     /*      Geotransform.                                                   */
     /* -------------------------------------------------------------------- */
-    if (poAuxDS->GetGeoTransform(psPam->adfGeoTransform) == CE_None)
+    if (poAuxDS->GetGeoTransform(psPam->adfGeoTransform.data()) == CE_None)
         psPam->bHaveGeoTransform = TRUE;
 
     /* -------------------------------------------------------------------- */