Move body of reclassifyValue to header so it can be optimised

qgis · Jun 13, 2018 · dc77c59 · dc77c59
1 parent a534286
commit dc77c59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/analysis/processing/qgsreclassifyutils.cpp b/src/analysis/processing/qgsreclassifyutils.cpp
@@ -82,19 +82,7 @@ void QgsReclassifyUtils::reclassify( const QVector<QgsReclassifyUtils::RasterCla
   destinationRaster->setEditable( false );
 }
 
-double QgsReclassifyUtils::reclassifyValue( const QVector<QgsReclassifyUtils::RasterClass> &classes, double input, bool &reclassified )
-{
-  reclassified = false;
-  for ( const QgsReclassifyUtils::RasterClass &c : classes )
-  {
-    if ( c.contains( input ) )
-    {
-      reclassified = true;
-      return c.value;
-    }
-  }
-  return input;
-}
+
 
 ///@endcond
 

diff --git a/src/analysis/processing/qgsreclassifyutils.h b/src/analysis/processing/qgsreclassifyutils.h
@@ -23,6 +23,7 @@
 #include "qgis.h"
 #include "qgis_analysis.h"
 #include "qgsrasterrange.h"
+#include <QVector>
 
 class QgsRasterInterface;
 class QgsProcessingFeedback;
@@ -104,12 +105,25 @@ class ANALYSIS_EXPORT QgsReclassifyUtils
      * If no matching class was found then \a reclassified will be set to false, and the
      * original \a input value returned unchanged.
      */
-    static double reclassifyValue( const QVector< RasterClass > &classes, double input, bool &reclassified );
+    static double reclassifyValue( const QVector< RasterClass > &classes, double input, bool &reclassified )
+    {
+      reclassified = false;
+      for ( const QgsReclassifyUtils::RasterClass &c : classes )
+      {
+        if ( c.contains( input ) )
+        {
+          reclassified = true;
+          return c.value;
+        }
+      }
+      return input;
+    }
 
 };
 
 Q_DECLARE_TYPEINFO( QgsReclassifyUtils::RasterClass, Q_MOVABLE_TYPE );
 
+
 ///@endcond PRIVATE
 
 #endif // QGSRECLASSIFYUTILS