Skip to content
Permalink
Browse files

Change filter string for DTED raster (patch #1925 provided by kyle)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13273 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Apr 7, 2010
1 parent ff499bc commit ca7fe0cedaa97ed95e7ac7fc45cbb5c233ec1884
Showing with 6 additions and 4 deletions.
  1. +6 −4 src/core/raster/qgsrasterlayer.cpp
@@ -303,7 +303,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
// "DMD_EXTENSION=.*". We'll also store the long name of the
// driver, which will be found in DMD_LONGNAME, which will have the
// same form.

// start with the default case
theFileFiltersString = tr( "All files (*)" );

@@ -414,8 +414,10 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
}
else if ( myGdalDriverDescription.startsWith( "DTED" ) )
{
// DTED use "*.dt0"
// DTED use "*.dt0, *.dt1, *.dt2"
QString glob = "*.dt0";
glob += " *.dt1";
glob += " *.dt2";
theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
}
else if ( myGdalDriverDescription.startsWith( "MrSID" ) )
@@ -5550,8 +5552,8 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
{
if ( !mValid )
return false;
if( !mCurrentImage && !mCurrentGDALData )

if ( !mCurrentImage && !mCurrentGDALData )
{
return false;
}

0 comments on commit ca7fe0c

Please sign in to comment.
You can’t perform that action at this time.