GeoHEIF: Fixed respecting CRS axis order (e.g., for EPSG:4326)

Co-authored-by: Martin Desruisseaux <[email protected]>
OSGeo · Nov 28, 2024 · 8682f99 · 8682f99
1 parent 4aee058
commit 8682f99
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/frmts/heif/heifdataset.cpp b/frmts/heif/heifdataset.cpp
@@ -845,6 +845,14 @@ CPLErr GDALHEIFDataset::GetGeoTransform(double *padfTransform)
         heif_item_get_property_raw_data(m_hCtxt, item_id, prop_ids[i],
                                         data->data());
         geoHEIF.setModelTransformation(data->data(), data->size());
+
+        // NOTE: Calling this here will ensure that CRS has been set up,
+        //       since QGIS will invoke GDALGetGeoTransform() before
+        //       GetSpatialRef() is ever called.
+        //       This reading of CRS should probably be done outside
+        //       of GetSpatialRef()
+        GetSpatialRef();
+
         geoHEIF.GetGeoTransform(padfTransform);
         return CE_None;
     }
@@ -857,6 +865,10 @@ CPLErr GDALHEIFDataset::GetGeoTransform(double *padfTransform)
 /************************************************************************/
 const OGRSpatialReference *GDALHEIFDataset::GetSpatialRef() const
 {
+    // REVIEW: This function being declared this-const should mean
+    //         that it cannot possibly modify this object.
+    //         Calling geoHEIF.GetSpatialRef() the first time
+    //         breaks this assumption.
     if (geoHEIF.has_SRS())
         return geoHEIF.GetSpatialRef();
 

diff --git a/gcore/geoheif.cpp b/gcore/geoheif.cpp
@@ -86,12 +86,30 @@ void GeoHEIF::setModelTransformation(const uint8_t *payload, size_t length)
 
 CPLErr GeoHEIF::GetGeoTransform(double *padfTransform) const
 {
-    padfTransform[1] = modelTransform[1];
-    padfTransform[2] = modelTransform[2];
-    padfTransform[0] = modelTransform[0];
-    padfTransform[4] = modelTransform[4];
-    padfTransform[5] = modelTransform[5];
-    padfTransform[3] = modelTransform[3];
+    int nAxes = 0;
+    const int *axes = has_SRS()
+                          ? OSRGetDataAxisToSRSAxisMapping(
+                                OGRSpatialReference::ToHandle(&m_oSRS), &nAxes)
+                          : nullptr;
+
+    if (axes && axes[0] != 1)
+    {
+        padfTransform[1] = modelTransform[4];
+        padfTransform[2] = modelTransform[5];
+        padfTransform[0] = modelTransform[3];
+        padfTransform[4] = modelTransform[1];
+        padfTransform[5] = modelTransform[2];
+        padfTransform[3] = modelTransform[3];
+    }
+    else
+    {
+        padfTransform[1] = modelTransform[1];
+        padfTransform[2] = modelTransform[2];
+        padfTransform[0] = modelTransform[0];
+        padfTransform[4] = modelTransform[4];
+        padfTransform[5] = modelTransform[5];
+        padfTransform[3] = modelTransform[3];
+    }
     return CE_None;
 }
 
@@ -150,6 +168,7 @@ void GeoHEIF::extractSRS(const uint8_t *payload, size_t length) const
         CPLDebug("GeoHEIF", "CRS encoding is not supported");
         return;
     }
+    m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 }
 
 void GeoHEIF::addGCPs(const uint8_t *data, size_t length)