From 74cb7edb5b3adcb627659064dd0a7f3acfd4b87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 16 Apr 2014 10:47:09 -0400
Subject: [PATCH] remove more unused variables

---
 include/llmr/map/map.hpp       | 5 -----
 include/llmr/map/source.hpp    | 2 +-
 src/map/map.cpp                | 4 +---
 src/map/transform.cpp          | 2 --
 src/renderer/line_bucket.cpp   | 3 ++-
 src/renderer/raster_bucket.cpp | 4 ++--
 src/style/properties.cpp       | 4 ++--
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/include/llmr/map/map.hpp b/include/llmr/map/map.hpp
index 0b87c7ae6..b7562bb83 100644
--- a/include/llmr/map/map.hpp
+++ b/include/llmr/map/map.hpp
@@ -84,11 +84,6 @@ private:
     Painter painter;
 
     std::map<std::string, const std::unique_ptr<Source>> sources;
-
-    int32_t min_zoom;
-    int32_t max_zoom;
-
-    // float pixel_ratio;
 };
 
 }
diff --git a/include/llmr/map/source.hpp b/include/llmr/map/source.hpp
index 7fa462ac3..9b89d0e54 100644
--- a/include/llmr/map/source.hpp
+++ b/include/llmr/map/source.hpp
@@ -26,7 +26,7 @@ public:
 
 public:
     Source(Map &map, Transform &transform, Painter &painter, Texturepool &texturepool,
-           const char *url = "", Type type = Type::vector, std::vector<uint32_t> zooms = {{0}},
+           const char *url = "", Type type = Type::vector, std::vector<uint32_t> zooms = {0},
            uint32_t tile_size = 512, uint32_t min_zoom = 0, uint32_t max_zoom = 14,
            bool enabled = true);
 
diff --git a/src/map/map.cpp b/src/map/map.cpp
index b85d56b8e..942cf1878 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -17,9 +17,7 @@ Map::Map(Settings& settings)
       texturepool(),
       style(),
       glyphAtlas(1024, 1024),
-      painter(transform, settings, style, glyphAtlas),
-      min_zoom(0),
-      max_zoom(21) {
+      painter(transform, settings, style, glyphAtlas) {
 }
 
 Map::~Map() {
diff --git a/src/map/transform.cpp b/src/map/transform.cpp
index 5dfd8c089..7cb0f679f 100644
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@@ -79,10 +79,8 @@ void Transform::scaleBy(double ds, double cx, double cy, double duration) {
     // clamp scale to min/max values
     double new_scale = scale * ds;
     if (new_scale < min_scale) {
-        ds = min_scale / scale;
         new_scale = min_scale;
     } else if (new_scale > max_scale) {
-        ds = max_scale / scale;
         new_scale = max_scale;
     }
 
diff --git a/src/renderer/line_bucket.cpp b/src/renderer/line_bucket.cpp
index 7b607d693..01d7c52a2 100644
--- a/src/renderer/line_bucket.cpp
+++ b/src/renderer/line_bucket.cpp
@@ -63,7 +63,8 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
     const JoinType join = geometry.join;
     const CapType cap = geometry.cap;
     const float miterLimit = geometry.miter_limit;
-    const float roundLimit = geometry.round_limit;
+    // TODO: use roundLimit
+    // const float roundLimit = geometry.round_limit;
 
     if (vertices.size() < 2) {
         // fprintf(stderr, "a line must have at least two vertices\n");
diff --git a/src/renderer/raster_bucket.cpp b/src/renderer/raster_bucket.cpp
index 54f7dc639..7ae18e995 100644
--- a/src/renderer/raster_bucket.cpp
+++ b/src/renderer/raster_bucket.cpp
@@ -3,10 +3,10 @@
 
 using namespace llmr;
 
-RasterBucket::RasterBucket(const BucketDescription& bucket_desc) {
+RasterBucket::RasterBucket(const BucketDescription &bucket_desc) {
 }
 
-void RasterBucket::render(Painter& painter, const std::string& layer_name, const Tile::ID& id) {
+void RasterBucket::render(Painter &, const std::string &, const Tile::ID &) {
     // The painter renders rasters directly. This function is a no-op
     // and exists just to satisfy the abstract superclass requirements.
     // That way, we can avoid having raster buckets pass around
diff --git a/src/style/properties.cpp b/src/style/properties.cpp
index 7e2fb6e65..46e84ce9b 100644
--- a/src/style/properties.cpp
+++ b/src/style/properties.cpp
@@ -8,11 +8,11 @@
 using namespace llmr;
 
 
-float functions::null(float z, const std::vector<float>&) {
+float functions::null(float, const std::vector<float>&) {
     return 0;
 }
 
-float functions::constant(float z, const std::vector<float>& values) {
+float functions::constant(float, const std::vector<float>& values) {
     assert(values.size() == 1);
     return values.front();
 }