Merge branch 'master' into etiennebr-postgis3

r-spatial · Mar 19, 2020 · cdf5f58 · cdf5f58
2 parents 57a7264 + 882e24a
commit cdf5f58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -34,7 +34,7 @@ Authors@R:
              role = "ctb",
              comment = c(ORCID = "0000-0002-4035-0289")),
       person(given = "Kirill",
-             family = "M<U+00FC>ller",
+             family = "M\u00fcller",
              role = "ctb"),
       person(given = "Thomas Lin",
              family = "Pedersen",

diff --git a/src/stars.cpp b/src/stars.cpp
@@ -309,13 +309,15 @@ List CPL_read_gdal(CharacterVector fname, CharacterVector options, CharacterVect
 	// geotransform:
 	double adfGeoTransform[6];
 	CPLErr err = poDataset->GetGeoTransform( adfGeoTransform );
+	// return the default geotransform as per the
+	// GetGeoTransform() doc in classGDALDataset
 	NumericVector geotransform = NumericVector::create(
 		err == CE_None ? adfGeoTransform[0] : 0,
 		err == CE_None ? adfGeoTransform[1] : 1,
 		err == CE_None ? adfGeoTransform[2] : 0,
 		err == CE_None ? adfGeoTransform[3] : 0,
 		err == CE_None ? adfGeoTransform[4] : 0,
-		err == CE_None ? adfGeoTransform[5] : -1); // so non-geo is y-up
+		err == CE_None ? adfGeoTransform[5] : 1); // see https://github.com/r-spatial/sf/pull/1307
 	int default_geotransform = 0;
 	if (err != CE_None) {
 		default_geotransform = 1;