diff layer/ColourMapper.h @ 1045:f535f6e5dbb0 alignment-simple

Merge in from SV 3.0-integration branches
author Chris Cannam
date Wed, 02 Mar 2016 17:25:27 +0000
parents 9c890b7dfa83
children 65b183494331
line wrap: on
line diff
--- a/layer/ColourMapper.h	Mon Jun 15 09:15:55 2015 +0100
+++ b/layer/ColourMapper.h	Wed Mar 02 17:25:27 2016 +0000
@@ -33,13 +33,13 @@
     virtual ~ColourMapper();
 
     enum StandardMap {
-        DefaultColours,
+        Green,
         Sunset,
         WhiteOnBlack,
         BlackOnWhite,
-        RedOnBlue,
-        YellowOnBlack,
-        BlueOnBlack,
+        Cherry,
+        Wasp,
+        Ice,
         FruitSalad,
         Banded,
         Highlight,