Fixed bug that caused GDAL raster layers without a geotransform to not be displayed

larsl · larsl · commit b29d1297d735 · 2006-03-11T09:59:46.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4998 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/raster/qgsrasterlayer.cpp b/src/raster/qgsrasterlayer.cpp
@@ -4073,7 +4073,13 @@ QString QgsRasterLayer::getMetadata()
 
   if (providerKey.isEmpty())
   {
-    if (gdalDataset->GetGeoTransform(adfGeoTransform) == CE_None)
+    if (gdalDataset->GetGeoTransform(adfGeoTransform) != CE_None)
+    {
+      // if the raster does not have a valid transform we need to use
+      // a pixel size of (1,-1), but GDAL returns (1,1)
+      adfGeoTransform[5] = -1;
+    }
+    else
     {
       myMetadataQString += "<tr><td bgcolor=\"gray\">";
       myMetadataQString += tr("Origin:");

Original file line number	Diff line number	Diff line change
`@@ -4073,7 +4073,13 @@ QString QgsRasterLayer::getMetadata()`
`4073`	`4073`
`4074`	`4074`	`if (providerKey.isEmpty())`
`4075`	`4075`	`{`
`4076`		`- if (gdalDataset->GetGeoTransform(adfGeoTransform) == CE_None)`
	`4076`	`+ if (gdalDataset->GetGeoTransform(adfGeoTransform) != CE_None)`
	`4077`	`+ {`
	`4078`	`+ // if the raster does not have a valid transform we need to use`
	`4079`	`+ // a pixel size of (1,-1), but GDAL returns (1,1)`
	`4080`	`+ adfGeoTransform[5] = -1;`
	`4081`	`+ }`
	`4082`	`+ else`
`4077`	`4083`	`{`
`4078`	`4084`	`myMetadataQString += "<tr><td bgcolor=\"gray\">";`
`4079`	`4085`	`myMetadataQString += tr("Origin:");`