qgis · Apr 3, 2017
diff --git a/‎python/core/raster/qgspalettedrasterrenderer.sip
Lines changed: 1 addition & 0 deletions b/‎python/core/raster/qgspalettedrasterrenderer.sip
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/core/raster/qgspalettedrasterrenderer.cpp
Lines changed: 13 additions & 0 deletions b/‎src/core/raster/qgspalettedrasterrenderer.cpp
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/core/raster/qgspalettedrasterrenderer.h
Lines changed: 7 additions & 2 deletions b/‎src/core/raster/qgspalettedrasterrenderer.h
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/core/raster/qgsrasterrendererregistry.cpp
Lines changed: 1 addition & 10 deletions b/‎src/core/raster/qgsrasterrendererregistry.cpp
Lines changed: 1 addition & 10 deletions
@@ -32,6 +32,7 @@ class QgsPalettedRasterRenderer : QgsRasterRenderer
     void legendSymbologyItems( QList< QPair< QString, QColor > > &symbolItems /Out/ ) const;
 
     QList<int> usesBands() const;
+    static QgsPalettedRasterRenderer::ClassData colorTableToClassData( const QList<QgsColorRampShader::ColorRampItem> &table );
 
   private:
 
 
@@ -255,6 +255,18 @@ QList<int> QgsPalettedRasterRenderer::usesBands() const
   return bandList;
 }
 
+QgsPalettedRasterRenderer::ClassData QgsPalettedRasterRenderer::colorTableToClassData( const QList<QgsColorRampShader::ColorRampItem> &table )
+{
+  QList<QgsColorRampShader::ColorRampItem>::const_iterator colorIt = table.constBegin();
+  QgsPalettedRasterRenderer::ClassData classes;
+  for ( ; colorIt != table.constEnd(); ++colorIt )
+  {
+    int idx = ( int )( colorIt->value );
+    classes.insert( idx, QgsPalettedRasterRenderer::Class( colorIt->color, colorIt->label ) );
+  }
+  return classes;
+}
+
 void QgsPalettedRasterRenderer::updateArrays()
 {
   // find maximum color index
@@ -263,6 +275,7 @@ void QgsPalettedRasterRenderer::updateArrays()
   {
     mMaxColorIndex = qMax( mMaxColorIndex, mIt.key() );
   }
+  mMaxColorIndex = qMax( 0, mMaxColorIndex );
 
   delete [] mColors;
   delete [] mIsNoData;
 
@@ -22,6 +22,7 @@
 #include <QVector>
 
 #include "qgsrasterrenderer.h"
+#include "qgscolorrampshader.h"
 
 class QColor;
 class QDomElement;
@@ -89,6 +90,12 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
 
     QList<int> usesBands() const override;
 
+    /**
+     * Converts a raster color \a table to paletted renderer class data.
+     * @note added in QGIS 3.0
+     */
+    static QgsPalettedRasterRenderer::ClassData colorTableToClassData( const QList<QgsColorRampShader::ColorRampItem> &table );
+
   private:
 
     int mBand;
@@ -100,8 +107,6 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
     QRgb *mColors = nullptr;
     bool *mIsNoData = nullptr;
     void updateArrays();
-
-
 };
 
 #endif // QGSPALETTEDRASTERRENDERER_H
@@ -122,16 +122,7 @@ QgsRasterRenderer *QgsRasterRendererRegistry::defaultRendererForDrawingStyle( Qg
     case QgsRaster::PalettedColor:
     {
       int grayBand = 1; //reasonable default
-      QList<QgsColorRampShader::ColorRampItem> colorEntries = provider->colorTable( grayBand );
-
-      QList<QgsColorRampShader::ColorRampItem>::const_iterator colorIt = colorEntries.constBegin();
-      QgsPalettedRasterRenderer::ClassData classes;
-      for ( ; colorIt != colorEntries.constEnd(); ++colorIt )
-      {
-        int idx = ( int )( colorIt->value );
-        classes.insert( idx, QgsPalettedRasterRenderer::Class( colorIt->color, colorIt->label ) );
-      }
-
+      QgsPalettedRasterRenderer::ClassData classes = QgsPalettedRasterRenderer::colorTableToClassData( provider->colorTable( grayBand ) );
       renderer = new QgsPalettedRasterRenderer( provider,
           grayBand,
           classes );
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,18 @@ QList<int> QgsPalettedRasterRenderer::usesBands() const`
`255`	`255`	`return bandList;`
`256`	`256`	`}`
`257`	`257`
	`258`	`+QgsPalettedRasterRenderer::ClassData QgsPalettedRasterRenderer::colorTableToClassData( const QList<QgsColorRampShader::ColorRampItem> &table )`
	`259`	`+{`
	`260`	`+ QList<QgsColorRampShader::ColorRampItem>::const_iterator colorIt = table.constBegin();`
	`261`	`+ QgsPalettedRasterRenderer::ClassData classes;`
	`262`	`+ for ( ; colorIt != table.constEnd(); ++colorIt )`
	`263`	`+ {`
	`264`	`+ int idx = ( int )( colorIt->value );`
	`265`	`+ classes.insert( idx, QgsPalettedRasterRenderer::Class( colorIt->color, colorIt->label ) );`
	`266`	`+ }`
	`267`	`+ return classes;`
	`268`	`+}`
	`269`	`+`
`258`	`270`	`void QgsPalettedRasterRenderer::updateArrays()`
`259`	`271`	`{`
`260`	`272`	`// find maximum color index`
`@@ -263,6 +275,7 @@ void QgsPalettedRasterRenderer::updateArrays()`
`263`	`275`	`{`
`264`	`276`	`mMaxColorIndex = qMax( mMaxColorIndex, mIt.key() );`
`265`	`277`	`}`
	`278`	`+ mMaxColorIndex = qMax( 0, mMaxColorIndex );`
`266`	`279`
`267`	`280`	`delete [] mColors;`
`268`	`281`	`delete [] mIsNoData;`