-Prevent internal pyramids from being built on rasters with JPEG compression

ersts · ersts · commit e8d65308f052 · 2008-11-23T22:58:53.000Z
-closes ticket #1357 git-svn-id: http://svn.osgeo.org/qgis/trunk@9688 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1587,11 +1587,15 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
       QMessageBox::warning( this, tr( "Building pyramids failed." ),
                             tr( "Building pyramid overviews is not supported on this type of raster." ) );
     }
+    else if ( res == "ERROR_JPEG_COMPRESSION" )
+    {
+      QMessageBox::warning( this, tr( "Building pyramids failed." ),
+                            tr( "Building internal pyramid overviews is not supported on raster layers with JPEG compression." ) );
+    }
     else if ( res == "ERROR_VIRTUAL" )
     {
       QMessageBox::warning( this, tr( "Building pyramids failed." ),
                             tr( "Building pyramid overviews is not supported on this type of raster." ) );
-      //TODO: should really read -- Building pyramid overviews is not supported for 'warped virtual dataset'. -- But in feature freeze, and translation requests have already gone out PJE20080912
     }
 
   }
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -982,6 +982,11 @@ QString QgsRasterLayer::buildPyramids( RasterPyramidList const & theRasterPyrami
 
   if ( theTryInternalFlag )
   {
+    QString myCompressionType = QString( GDALGetMetadataItem(  mGdalDataset, "COMPRESSION", "IMAGE_STRUCTURE" ) );
+    if( "JPEG" == myCompressionType )
+    {
+      return "ERROR_JPEG_COMPRESSION";
+    }
     //close the gdal dataset and reopen it in read / write mode
     GDALClose( mGdalDataset );
     mGdalBaseDataset = GDALOpen( QFile::encodeName( mDataSource ).constData(), GA_Update );

Original file line number	Diff line number	Diff line change
`@@ -1587,11 +1587,15 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()`
`1587`	`1587`	`QMessageBox::warning( this, tr( "Building pyramids failed." ),`
`1588`	`1588`	`tr( "Building pyramid overviews is not supported on this type of raster." ) );`
`1589`	`1589`	`}`
	`1590`	`+ else if ( res == "ERROR_JPEG_COMPRESSION" )`
	`1591`	`+ {`
	`1592`	`+ QMessageBox::warning( this, tr( "Building pyramids failed." ),`
	`1593`	`+ tr( "Building internal pyramid overviews is not supported on raster layers with JPEG compression." ) );`
	`1594`	`+ }`
`1590`	`1595`	`else if ( res == "ERROR_VIRTUAL" )`
`1591`	`1596`	`{`
`1592`	`1597`	`QMessageBox::warning( this, tr( "Building pyramids failed." ),`
`1593`	`1598`	`tr( "Building pyramid overviews is not supported on this type of raster." ) );`
`1594`		`- //TODO: should really read -- Building pyramid overviews is not supported for 'warped virtual dataset'. -- But in feature freeze, and translation requests have already gone out PJE20080912`
`1595`	`1599`	`}`
`1596`	`1600`
`1597`	`1601`	`}`