[core] Fix std::move() misuse that disables copy elision

This commit is contained in:
Konstantin Käfer
2015-12-01 16:45:39 +01:00
parent e12cd6aef4
commit dc620f48de
10 changed files with 14 additions and 14 deletions

View File

@@ -185,7 +185,7 @@ PremultipliedImage HeadlessView::readStillImage() {
std::memcpy(rgba + j * stride, tmp.get(), stride);
}
return std::move(image);
return image;
}
void HeadlessView::clearBuffers() {

View File

@@ -69,7 +69,7 @@ void Database::exec(const std::string &sql) {
Statement Database::prepare(const char *query) {
assert(db);
return std::move(Statement(db, query));
return Statement(db, query);
}
Statement::Statement(sqlite3 *db, const char *sql) {

View File

@@ -121,9 +121,9 @@ void SQLiteCache::Impl::get(const Resource &resource, Callback callback) {
response->modified = Seconds(getStmt->get<Seconds::rep>(1));
response->etag = getStmt->get<std::string>(2);
response->expires = Seconds(getStmt->get<Seconds::rep>(3));
response->data = std::make_shared<std::string>(std::move(getStmt->get<std::string>(4)));
response->data = std::make_shared<std::string>(getStmt->get<std::string>(4));
if (getStmt->get<int>(5)) { // == compressed
response->data = std::make_shared<std::string>(std::move(util::decompress(*response->data)));
response->data = std::make_shared<std::string>(util::decompress(*response->data));
}
callback(std::move(response));
} else {

View File

@@ -246,7 +246,7 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
painter->render(*style, frame, data.getAnnotationManager()->getSpriteAtlas());
if (data.mode == MapMode::Still) {
callback(nullptr, std::move(view.readStillImage()));
callback(nullptr, view.readStillImage());
callback = nullptr;
}

View File

@@ -164,7 +164,7 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) {
} else if (layer_pbf.tag == 3) { // keys
keys.emplace(layer_pbf.string(), keys.size());
} else if (layer_pbf.tag == 4) { // values
values.emplace_back(std::move(parseValue(layer_pbf.message())));
values.emplace_back(parseValue(layer_pbf.message()));
} else if (layer_pbf.tag == 5) { // extent
extent = layer_pbf.varint();
} else {

View File

@@ -49,7 +49,7 @@ Anchors resample(const std::vector<Coordinate> &line, const float offset, const
// This has the most effect for short lines in overscaled tiles, since the
// initial offset used in overscaled tiles is calculated to align labels with positions in
// parent tiles instead of placing the label as close to the beginning as possible.
anchors = std::move(resample(line, distance / 2, spacing, angleWindowSize, maxAngle, labelLength, continuedLine, true));
anchors = resample(line, distance / 2, spacing, angleWindowSize, maxAngle, labelLength, continuedLine, true);
}
return anchors;

View File

@@ -23,7 +23,7 @@ PremultipliedImage premultiply(UnassociatedImage&& src) {
b = (b * a + 127) / 255;
}
return std::move(dst);
return dst;
}
UnassociatedImage unpremultiply(PremultipliedImage&& src) {
@@ -46,7 +46,7 @@ UnassociatedImage unpremultiply(PremultipliedImage&& src) {
}
}
return std::move(dst);
return dst;
}
}

View File

@@ -36,7 +36,7 @@ PremultipliedImage render(Map& map) {
map.renderStill([&](std::exception_ptr, PremultipliedImage&& image) {
promise.set_value(std::move(image));
});
return std::move(promise.get_future().get());
return promise.get_future().get();
}
void checkRendering(Map& map, const char * name) {

View File

@@ -33,7 +33,7 @@ TEST(API, RepeatedRender) {
map.renderStill([&promise](std::exception_ptr, PremultipliedImage&& image) {
promise.set_value(std::move(image));
});
auto result = std::move(promise.get_future().get());
auto result = promise.get_future().get();
ASSERT_EQ(256, result.width);
ASSERT_EQ(512, result.height);
util::write_file("test/fixtures/api/1.png", encodePNG(result));
@@ -45,7 +45,7 @@ TEST(API, RepeatedRender) {
map.renderStill([&promise](std::exception_ptr, PremultipliedImage&& image) {
promise.set_value(std::move(image));
});
auto result = std::move(promise.get_future().get());
auto result = promise.get_future().get();
ASSERT_EQ(256, result.width);
ASSERT_EQ(512, result.height);
util::write_file("test/fixtures/api/2.png", encodePNG(result));

View File

@@ -67,7 +67,7 @@ void MockFileSource::Impl::replyWithSuccess(Resource resource, Callback callback
Response res;
try {
res.data = std::make_shared<const std::string>(std::move(util::read_file(resource.url)));
res.data = std::make_shared<const std::string>(util::read_file(resource.url));
} catch (const std::exception& err) {
res.error = std::make_unique<Response::Error>(Response::Error::Reason::Other, err.what());
}
@@ -103,7 +103,7 @@ void MockFileSource::Impl::replyWithCorruptedData(Resource resource, Callback ca
}
Response res;
auto data = std::make_shared<std::string>(std::move(util::read_file(resource.url)));
auto data = std::make_shared<std::string>(util::read_file(resource.url));
data->insert(0, "CORRUPTED");
res.data = std::move(data);
callback(res);