remove more unused variables

This commit is contained in:
Konstantin Käfer
2014-04-16 10:47:09 -04:00
parent 1b922e3a34
commit 74cb7edb5b
7 changed files with 8 additions and 16 deletions

View File

@@ -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;
};
}

View File

@@ -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);

View File

@@ -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() {

View File

@@ -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;
}

View File

@@ -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");

View File

@@ -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

View File

@@ -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();
}