From 34b90476b460135aff4ad52032bdcdce5db0353a Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Mon, 26 May 2014 23:48:50 -0700
Subject: [PATCH] refs #253: support blur function property values

---
 include/llmr/style/properties.hpp | 6 +++---
 src/style/style.cpp               | 6 +++---
 src/style/style_parser.cpp        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/llmr/style/properties.hpp b/include/llmr/style/properties.hpp
index af304c1ea..a06161375 100644
--- a/include/llmr/style/properties.hpp
+++ b/include/llmr/style/properties.hpp
@@ -92,9 +92,9 @@ struct GenericClass {
     boost::optional<FunctionProperty> opacity;
     boost::optional<PropertyTransition> opacity_transition;
     boost::optional<bool> prerender;
-    boost::optional<float> prerenderBuffer;
-    boost::optional<uint16_t> prerenderSize;
-    boost::optional<uint16_t> prerenderBlur;
+    boost::optional<FunctionProperty> prerenderBuffer;
+    boost::optional<FunctionProperty> prerenderSize;
+    boost::optional<FunctionProperty> prerenderBlur;
 };
 
 struct GenericProperties {
diff --git a/src/style/style.cpp b/src/style/style.cpp
index 38b8f1723..7be28868f 100644
--- a/src/style/style.cpp
+++ b/src/style/style.cpp
@@ -56,15 +56,15 @@ void Style::cascadeProperties(GenericProperties &properties, const GenericClass&
     }
 
     if (klass.prerenderBuffer) {
-        properties.prerenderBuffer = klass.prerenderBuffer.get();
+        properties.prerenderBuffer = klass.prerenderBuffer.get().evaluate<double>(z);
     }
 
     if (klass.prerenderSize) {
-        properties.prerenderSize = klass.prerenderSize.get();
+        properties.prerenderSize = klass.prerenderSize.get().evaluate<uint64_t>(z);
     }
 
     if (klass.prerenderBlur) {
-        properties.prerenderBlur = klass.prerenderBlur.get();
+        properties.prerenderBlur = klass.prerenderBlur.get().evaluate<uint64_t>(z);
     }
 }
 
diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index 56e28350b..069a424d7 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -525,15 +525,15 @@ void StyleParser::parseGenericClass(GenericClass &klass, JSVal value) {
     }
 
     if (value.HasMember("prerender-buffer")) {
-        klass.prerenderBuffer = toNumber<double>(parseValue(value["prerender-buffer"]));
+        klass.prerenderBuffer = parseFunction(value["prerender-buffer"]);
     }
 
     if (value.HasMember("prerender-size")) {
-        klass.prerenderBuffer = toNumber<uint64_t>(parseValue(value["prerender-size"]));
+        klass.prerenderBuffer = parseFunction(value["prerender-size"]);
     }
 
     if (value.HasMember("prerender-blur")) {
-        klass.prerenderBlur = toNumber<uint64_t>(parseValue(value["prerender-blur"]));
+        klass.prerenderBlur = parseFunction(value["prerender-blur"]);
     }
 }