diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-05-17 09:08:37 -0700 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-05-18 16:29:06 -0700 |
commit | 8ca5f049b6d984e8bb46df0e14a434eb27317697 (patch) | |
tree | 7498be3b6a687500ad00ff095e4737f1cd5e797a | |
parent | 092543f8c6f160859e4036b5783e28d94d2963a7 (diff) | |
download | qtlocation-mapboxgl-8ca5f049b6d984e8bb46df0e14a434eb27317697.tar.gz |
Incorporate review feedback: Whitespace, formatting, etc
-rw-r--r-- | include/mbgl/style/sources/image_source.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_raster_layer.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/painters/painter_debug.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/render_item.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/sources/image_source.cpp | 2 | ||||
-rw-r--r-- | test/src/mbgl/test/conversion_stubs.hpp | 2 |
9 files changed, 10 insertions, 12 deletions
diff --git a/include/mbgl/style/sources/image_source.hpp b/include/mbgl/style/sources/image_source.hpp index b0dafaa2d4..fe52c6fd68 100644 --- a/include/mbgl/style/sources/image_source.hpp +++ b/include/mbgl/style/sources/image_source.hpp @@ -20,7 +20,7 @@ public: void setImage(mbgl::UnassociatedImage); - void setCoordinates(const std::vector<LatLng>); + void setCoordinates(const std::vector<LatLng>&); std::vector<LatLng> getCoordinates() const; class Impl; diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 500a167432..3c0313efd1 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -46,7 +46,7 @@ void RenderRasterLayer::uploadBuckets(gl::Context& context, RenderSource* source } } } else { - RenderImageSource * imageSource = dynamic_cast<RenderImageSource*>(source); + RenderImageSource* imageSource = dynamic_cast<RenderImageSource*>(source); if (imageSource) { imageSource->upload(context); } @@ -61,7 +61,7 @@ void RenderRasterLayer::render(Painter& painter, PaintParameters& parameters, Re bucket->render(painter, parameters, *this, tile); } } else { - RenderImageSource * imageSource = dynamic_cast<RenderImageSource*>(source); + RenderImageSource* imageSource = dynamic_cast<RenderImageSource*>(source); if (imageSource) { imageSource->render(painter, parameters, *this); } diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index d42160c0d7..8d9e8a488e 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -86,7 +86,7 @@ public: void renderClippingMask(const UnwrappedTileID&, const ClipID&); void renderTileDebug(const RenderTile&); - void renderTileDebug(mat4& matrix); + void renderTileDebug(const mat4& matrix); void renderFill(PaintParameters&, FillBucket&, const RenderFillLayer&, const RenderTile&); void renderFillExtrusion(PaintParameters&, FillExtrusionBucket&, const RenderFillExtrusionLayer&, const RenderTile&); void renderLine(PaintParameters&, LineBucket&, const RenderLineLayer&, const RenderTile&); diff --git a/src/mbgl/renderer/painters/painter_debug.cpp b/src/mbgl/renderer/painters/painter_debug.cpp index 9197b15cf2..ee76aee54c 100644 --- a/src/mbgl/renderer/painters/painter_debug.cpp +++ b/src/mbgl/renderer/painters/painter_debug.cpp @@ -77,7 +77,7 @@ void Painter::renderTileDebug(const RenderTile& renderTile) { } } -void Painter::renderTileDebug(mat4& matrix) { +void Painter::renderTileDebug(const mat4& matrix) { if (frame.debugOptions == MapDebugOptions::NoDebug) return; diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp index bc8e234cd4..4bf5629263 100644 --- a/src/mbgl/renderer/render_item.hpp +++ b/src/mbgl/renderer/render_item.hpp @@ -18,12 +18,12 @@ namespace style { class RenderItem { public: RenderItem(RenderLayer& layer_, - RenderSource * renderSource_) + RenderSource* renderSource_) : layer(layer_), source(renderSource_) { } RenderLayer& layer; - RenderSource * source; + RenderSource* source; }; class RenderData { diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 8fbd6041ed..7f8e5014f7 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -13,7 +13,7 @@ namespace mbgl { using namespace style; RenderImageSource::RenderImageSource(Immutable<style::ImageSource::Impl> impl_) -: RenderSource(impl_) { + : RenderSource(impl_) { } const style::ImageSource::Impl& RenderImageSource::impl() const { diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index 6d3a0ce660..cbd6825f55 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -27,7 +27,7 @@ public: const mat4& clipMatrix, const TransformState&) final; - void render (Painter&, PaintParameters& , const RenderLayer& ) ; + void render(Painter&, PaintParameters& , const RenderLayer& ) ; void finishRender(Painter&) final; diff --git a/src/mbgl/style/sources/image_source.cpp b/src/mbgl/style/sources/image_source.cpp index 8e6ca673f6..4f86befd0b 100644 --- a/src/mbgl/style/sources/image_source.cpp +++ b/src/mbgl/style/sources/image_source.cpp @@ -18,7 +18,7 @@ const ImageSource::Impl& ImageSource::impl() const { return static_cast<const Impl&>(*baseImpl); } -void ImageSource::setCoordinates(const std::vector<LatLng> coords_) { +void ImageSource::setCoordinates(const std::vector<LatLng>& coords_) { baseImpl = makeMutable<Impl>(impl(), coords_); observer->onSourceChanged(*this); } diff --git a/test/src/mbgl/test/conversion_stubs.hpp b/test/src/mbgl/test/conversion_stubs.hpp index d957cfb617..30395ddb97 100644 --- a/test/src/mbgl/test/conversion_stubs.hpp +++ b/test/src/mbgl/test/conversion_stubs.hpp @@ -95,8 +95,6 @@ inline optional<float> toNumber(const Value& value) { inline optional<double> toDouble(const Value& value) { if (value.is<double>()) { return value.get<double>(); - } else { - return {}; } return {}; } |