From b2aa60baac243a8c688c93353174fd2ae5b7d5bb Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Tue, 12 Aug 2014 22:56:16 -0700
Subject: [PATCH] std namespacing trig fns

---
 src/renderer/painter_raster.cpp | 10 ++++------
 src/shader/raster_shader.cpp    |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/renderer/painter_raster.cpp b/src/renderer/painter_raster.cpp
index 86acf0153..3d26e724b 100644
--- a/src/renderer/painter_raster.cpp
+++ b/src/renderer/painter_raster.cpp
@@ -7,8 +7,6 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/transform.hpp>
 
-#include <cmath>
-
 using namespace mbgl;
 
 void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix) {
@@ -85,12 +83,12 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
 
 std::array<float, 3> Painter::spinWeights(float spin) {
     spin *= M_PI / 180;
-    float s = sin(spin);
-    float c = cos(spin);
+    float s = std::sin(spin);
+    float c = std::cos(spin);
     std::array<float, 3> spin_weights = {{
         (2 * c + 1) / 3,
-        (-sqrtf(3.0) * s - c + 1) / 3,
-        (sqrtf(3.0) * s - c + 1) / 3
+        (-std::sqrtf(3.0) * s - c + 1) / 3,
+        (std::sqrtf(3.0) * s - c + 1) / 3
     }};
     return spin_weights;
 }
\ No newline at end of file
diff --git a/src/shader/raster_shader.cpp b/src/shader/raster_shader.cpp
index 6531bad1a..51b328fa8 100644
--- a/src/shader/raster_shader.cpp
+++ b/src/shader/raster_shader.cpp
@@ -68,7 +68,7 @@ void RasterShader::setBrightness(float new_brightness_low, float new_brightness_
         glUniform1f(u_brightness_low, new_brightness_low);
         brightness_low = new_brightness_low;
     }
-    if (brightness_high!= new_brightness_high) {
+    if (brightness_high != new_brightness_high) {
         glUniform1f(u_brightness_high, new_brightness_high);
         brightness_high = new_brightness_high;
     }