1 files changed, 14 insertions, 8 deletions
diff --git a/src/mbgl/layer/raster_layer.hpp b/src/mbgl/layer/raster_layer.hpp
index 650ffc8ef1..800236016d 100644
--- a/src/mbgl/layer/raster_layer.hpp
+++ b/src/mbgl/layer/raster_layer.hpp
@@ -2,11 +2,21 @@
 #define MBGL_RASTER_LAYER
 
 #include <mbgl/style/style_layer.hpp>
-#include <mbgl/style/style_properties.hpp>
-#include <mbgl/style/paint_properties_map.hpp>
+#include <mbgl/style/paint_property.hpp>
 
 namespace mbgl {
 
+class RasterPaintProperties {
+public:
+    PaintProperty<float> opacity = 1.0f;
+    PaintProperty<float> hueRotate = 0.0f;
+    PaintProperty<float> brightnessMin = 0.0f;
+    PaintProperty<float> brightnessMax = 1.0f;
+    PaintProperty<float> saturation = 0.0f;
+    PaintProperty<float> contrast = 0.0f;
+    PaintProperty<float> fadeDuration = 0.0f;
+};
+
 class RasterLayer : public StyleLayer {
 public:
     std::unique_ptr<StyleLayer> clone() const override;
@@ -15,15 +25,11 @@ public:
     void parsePaints(const JSVal&) override;
 
     void cascade(const StyleCascadeParameters&) override;
-    void recalculate(const StyleCalculationParameters&) override;
+    bool recalculate(const StyleCalculationParameters&) override;
 
     std::unique_ptr<Bucket> createBucket(StyleBucketParameters&) const override;
 
-    bool hasTransitions() const override;
-
-    PaintPropertiesMap paints;
-
-    RasterPaintProperties properties;
+    RasterPaintProperties paint;
 };
 
 }