Don't do color box calculations if there are enough colors in the pal…

…ette
qgis · Oct 2, 2012 · 9cd2bb2 · 9cd2bb2
1 parent e0ab410
commit 9cd2bb2
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -477,6 +477,19 @@ void QgsHttpRequestHandler::medianCut( QVector<QRgb>& colorTable, int nColors, c
   QHash<QRgb, int> inputColors;
   imageColors( inputColors, inputImage );
 
+  if ( inputColors.size() <= nColors ) //all the colors in the image can be mapped to one palette color
+  {
+    colorTable.resize( inputColors.size() );
+    int index = 0;
+    QHash<QRgb, int>::const_iterator inputColorIt = inputColors.constBegin();
+    for ( ; inputColorIt != inputColors.constEnd(); ++inputColorIt )
+    {
+      colorTable[index] = inputColorIt.key();
+      ++index;
+    }
+    return;
+  }
+
   //create first box
   QgsColorBox firstBox; //QList< QPair<QRgb, int> >
   int firstBoxPixelSum = 0;