Eliminate boolean return code
This commit is contained in:
@@ -23,8 +23,8 @@ void RasterBucket::render(Painter& painter,
|
||||
painter.renderRaster(*this, *layer.as<RasterLayer>(), 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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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<std::mutex> lock(mtx);
|
||||
if (img.data.get()) {
|
||||
loaded = true;
|
||||
}
|
||||
return loaded;
|
||||
loaded = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
~Raster();
|
||||
|
||||
// load image data
|
||||
bool load(PremultipliedImage);
|
||||
void load(PremultipliedImage);
|
||||
|
||||
// bind current texture
|
||||
void bind(bool linear = false);
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user