From da33bef634b9555fb93c5e02faffd29c516f7ec7 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 13:09:10 -0700
Subject: [PATCH 1/4] initialize variables

---
 src/style/properties.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/style/properties.cpp b/src/style/properties.cpp
index 0e4841830..b39f20c51 100644
--- a/src/style/properties.cpp
+++ b/src/style/properties.cpp
@@ -29,9 +29,11 @@ float functions::stops(float z, const std::vector<float>& stops) {
     if (stops.size() % 2 != 0) return 0;
 
     bool smaller = false;
-    float smaller_z, smaller_val;
+    float smaller_z = 0.0;
+    float smaller_val = 0.0;
     bool larger = false;
-    float larger_z, larger_val;
+    float larger_z = 0.0;
+    float larger_val = 0.0;
 
     for (uint32_t i = 0; i < stops.size(); i += 2) {
         float stop_z = stops[i];

From 23655f0bb1484408072a6ce60c8a787b4b51d460 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 13:09:24 -0700
Subject: [PATCH 2/4] use std::pow

---
 src/map/transform.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/map/transform.cpp b/src/map/transform.cpp
index 996117bfa..d567a586c 100644
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@@ -60,8 +60,8 @@ void Transform::_moveBy(const double dx, const double dy, const time duration) {
 
     // Un-rotate when rotated and panning far enough to show off-world in corners.
     double w = final.scale * util::tileSize / 2;
-    double m = std::sqrt(pow((current.width / 2), 2) + pow((current.height / 2), 2));
-    double x = std::abs(sqrt(pow(final.x, 2) + pow(final.y, 2)));
+    double m = std::sqrt(std::pow((current.width / 2), 2) + pow((current.height / 2), 2));
+    double x = std::abs(sqrt(std::pow(final.x, 2) + std::pow(final.y, 2)));
     if (current.angle && w - x < m) _setAngle(0, 500_milliseconds, true);
 
     if (duration == 0) {

From 5c7461f19e293491a1a0ae7c3d528364207c8007 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 13:10:51 -0700
Subject: [PATCH 3/4] use std::abs

---
 src/clipper/clipper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/clipper/clipper.cpp b/src/clipper/clipper.cpp
index 95975450e..56ad58416 100755
--- a/src/clipper/clipper.cpp
+++ b/src/clipper/clipper.cpp
@@ -2152,13 +2152,13 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2,
     else if (e1->PolyTyp != e2->PolyTyp)
     {
       //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ...
-      if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 && 
+      if ((e1->WindDelta == 0) && std::abs(e2->WindCnt) == 1 &&
         (m_ClipType != ctUnion || e2->WindCnt2 == 0))
       {
         AddOutPt(e1, Pt);
         if (e1Contributing) e1->OutIdx = Unassigned;
       }
-      else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) && 
+      else if ((e2->WindDelta == 0) && (std::abs(e1->WindCnt) == 1) &&
         (m_ClipType != ctUnion || e1->WindCnt2 == 0))
       {
         AddOutPt(e2, Pt);

From 30a34d73f87f28a63b4451e823b6d10ee3fc5d9e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 13:23:00 -0700
Subject: [PATCH 4/4] fix static analyzer warning: Result of 'calloc' is
 converted to a pointer of type 'char', which is incompatible with sizeof
 operand type 'uint32_t'

---
 include/llmr/geometry/sprite_atlas.hpp | 2 +-
 src/geometry/sprite_atlas.cpp          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/llmr/geometry/sprite_atlas.hpp b/include/llmr/geometry/sprite_atlas.hpp
index 220edc701..13b85e548 100644
--- a/include/llmr/geometry/sprite_atlas.hpp
+++ b/include/llmr/geometry/sprite_atlas.hpp
@@ -62,7 +62,7 @@ private:
     BinPack<dimension> bin;
     std::map<std::string, Rect<dimension>> images;
     std::set<std::string> uninitialized;
-    char *data = nullptr;
+    uint32_t *data = nullptr;
     std::atomic<bool> dirty;
     uint32_t texture = 0;
     uint32_t filter = 0;
diff --git a/src/geometry/sprite_atlas.cpp b/src/geometry/sprite_atlas.cpp
index 35f6f4588..4404695f9 100644
--- a/src/geometry/sprite_atlas.cpp
+++ b/src/geometry/sprite_atlas.cpp
@@ -30,7 +30,7 @@ bool SpriteAtlas::resize(const float newRatio) {
     pixelRatio = newRatio;
 
     if (data) {
-        char *old_data = data;
+        uint32_t *old_data = data;
 
         data = nullptr;
         allocate();
@@ -185,7 +185,7 @@ void SpriteAtlas::allocate() {
     if (!data) {
         dimension w = static_cast<dimension>(width * pixelRatio);
         dimension h = static_cast<dimension>(height * pixelRatio);
-        data = (char *)calloc(w * h, sizeof(uint32_t));
+        data = (uint32_t *)calloc(w * h, sizeof(uint32_t));
     }
 }