From 1a5eab785c360ef7981cd430f0356591c9c222d2 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 2 Jul 2015 15:15:17 -0700 Subject: [PATCH] Eliminate boolean return code --- src/mbgl/renderer/raster_bucket.cpp | 4 ++-- src/mbgl/renderer/raster_bucket.hpp | 2 +- src/mbgl/util/raster.cpp | 9 ++++----- src/mbgl/util/raster.hpp | 2 +- src/mbgl/util/worker.cpp | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp index 7a3e27acd..4dbbf1869 100644 --- a/src/mbgl/renderer/raster_bucket.cpp +++ b/src/mbgl/renderer/raster_bucket.cpp @@ -23,8 +23,8 @@ void RasterBucket::render(Painter& painter, painter.renderRaster(*this, *layer.as(), id, matrix); } -bool RasterBucket::setImage(PremultipliedImage image) { - return raster.load(std::move(image)); +void RasterBucket::setImage(PremultipliedImage image) { + raster.load(std::move(image)); } void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array) { diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp index 0f4263ec9..0f6237969 100644 --- a/src/mbgl/renderer/raster_bucket.hpp +++ b/src/mbgl/renderer/raster_bucket.hpp @@ -18,7 +18,7 @@ public: void render(Painter&, const StyleLayer&, const TileID&, const mat4&) override; bool hasData() const override; - bool setImage(PremultipliedImage); + void setImage(PremultipliedImage); void drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array); diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index a4c1d9113..704d05e1e 100644 --- a/src/mbgl/util/raster.cpp +++ b/src/mbgl/util/raster.cpp @@ -24,16 +24,15 @@ bool Raster::isLoaded() const { return loaded; } -bool Raster::load(PremultipliedImage image) { +void Raster::load(PremultipliedImage image) { + assert(image.data.get()); + img = std::move(image); width = GLsizei(img.width); height = GLsizei(img.height); std::lock_guard lock(mtx); - if (img.data.get()) { - loaded = true; - } - return loaded; + loaded = true; } diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 618c1a18a..02d6615a9 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -18,7 +18,7 @@ public: ~Raster(); // load image data - bool load(PremultipliedImage); + void load(PremultipliedImage); // bind current texture void bind(bool linear = false); diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp index 34f18dd3f..d23831b44 100644 --- a/src/mbgl/util/worker.cpp +++ b/src/mbgl/util/worker.cpp @@ -24,11 +24,10 @@ public: image = decodeImage(*data); } catch (...) { callback(RasterTileParseResult("error parsing raster image")); + return; } - if (!bucket->setImage(std::move(image))) { - callback(RasterTileParseResult("error setting raster image to bucket")); - } + bucket->setImage(std::move(image)); callback(RasterTileParseResult(std::move(bucket))); }