From 5ef87371aa62ff2e1abec90d460c38ba1faaf0a7 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Sat, 1 Dec 2018 17:31:45 +0100 Subject: [PATCH] Remove duplicated code The input check was already done before entering in the GPU branch --- src/analysis/raster/qgsrastercalculator.cpp | 23 --------------------- 1 file changed, 23 deletions(-) diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp index d6c8a0fd2a5..5b675502f8b 100644 --- a/src/analysis/raster/qgsrastercalculator.cpp +++ b/src/analysis/raster/qgsrastercalculator.cpp @@ -315,32 +315,9 @@ QgsRasterCalculator::Result QgsRasterCalculator::processCalculation( QgsFeedback #ifdef HAVE_OPENCL QgsRasterCalculator::Result QgsRasterCalculator::processCalculationGPU( QgsFeedback *feedback ) { - //prepare search string / tree std::unique_ptr< QgsRasterCalcNode > calcNode( QgsRasterCalcNode::parseRasterCalcString( mFormulaString, mLastError ) ); - if ( !calcNode ) - { - //error - return ParserError; - } - QString cExpression( calcNode->toString( true ) ); - // Safety check - for ( const auto &r : mRasterEntries ) - { - if ( !r.raster ) // no raster layer in entry - { - mLastError = QObject::tr( "No raster layer for entry %1" ).arg( r.ref ); - return InputLayerError; - } - - if ( r.bandNumber <= 0 || r.bandNumber > r.raster->bandCount() ) - { - mLastError = QObject::tr( "Band number %1 is not valid for entry %2" ).arg( r.bandNumber ).arg( r.ref ); - return BandError; - } - } - QList nodeList( calcNode->findNodes( QgsRasterCalcNode::Type::tRasterRef ) ); QSet capturedTexts; for ( const auto &r : qgis::as_const( nodeList ) )