Skip to content

Commit ca7fe0c

Browse files
author
mhugent
committed
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
1 parent ff499bc commit ca7fe0c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/core/raster/qgsrasterlayer.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
303303
// "DMD_EXTENSION=.*". We'll also store the long name of the
304304
// driver, which will be found in DMD_LONGNAME, which will have the
305305
// same form.
306-
306+
307307
// start with the default case
308308
theFileFiltersString = tr( "All files (*)" );
309309

@@ -414,8 +414,10 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
414414
}
415415
else if ( myGdalDriverDescription.startsWith( "DTED" ) )
416416
{
417-
// DTED use "*.dt0"
417+
// DTED use "*.dt0, *.dt1, *.dt2"
418418
QString glob = "*.dt0";
419+
glob += " *.dt1";
420+
glob += " *.dt2";
419421
theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
420422
}
421423
else if ( myGdalDriverDescription.startsWith( "MrSID" ) )
@@ -5550,8 +5552,8 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
55505552
{
55515553
if ( !mValid )
55525554
return false;
5553-
5554-
if( !mCurrentImage && !mCurrentGDALData )
5555+
5556+
if ( !mCurrentImage && !mCurrentGDALData )
55555557
{
55565558
return false;
55575559
}

0 commit comments

Comments
 (0)