diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 16:30:27 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 16:30:27 +0200 |
commit | 22e179aa37c3aece1350274e69ac86a5cd345a5a (patch) | |
tree | f68c04e7825e2534afc9626b0031d99230146e22 /include | |
parent | 18b1469e9ebd02465101fbea719c9c967d334072 (diff) | |
download | qtlocation-mapboxgl-22e179aa37c3aece1350274e69ac86a5cd345a5a.tar.gz |
remove trailing whitespace
[skip ci]
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/geometry/geometry.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/map/map.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/renderer/painter.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/renderer/raster_bucket.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/util/raster.hpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/mbgl/geometry/geometry.hpp b/include/mbgl/geometry/geometry.hpp index 47981ce83b..961569204d 100644 --- a/include/mbgl/geometry/geometry.hpp +++ b/include/mbgl/geometry/geometry.hpp @@ -12,7 +12,7 @@ class Geometry : private util::noncopyable { public: inline explicit Geometry(pbf& data); - + enum command : uint8_t { end = 0, move_to = 1, diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 14f8f40916..fba38879ed 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -46,7 +46,7 @@ public: void rerender(); void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); - + // Forces a map update: always triggers a rerender. void update(); diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 385e8bdd0e..db85d8703d 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -43,7 +43,7 @@ class LineBucket; class SymbolBucket; class RasterBucket; class PrerenderedTexture; - + struct FillProperties; struct RasterProperties; struct CompositeProperties; @@ -92,7 +92,7 @@ public: void preparePrerender(RasterBucket &bucket); void renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix, const RasterProperties& properties); - + void createPrerendered(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); void resize(); diff --git a/include/mbgl/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp index 41f4d4e4c0..a68475565b 100644 --- a/include/mbgl/renderer/raster_bucket.hpp +++ b/include/mbgl/renderer/raster_bucket.hpp @@ -17,19 +17,19 @@ class VertexArrayObject; class RasterBucket : public Bucket { public: RasterBucket(const std::shared_ptr<Texturepool> &texturepool, const StyleBucketRaster& properties); - + virtual void render(Painter& painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; bool setImage(const std::string &data); - + const StyleBucketRaster &properties; PrerenderedTexture texture; void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array); void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array, GLuint texture); - + Raster raster; private: diff --git a/include/mbgl/util/raster.hpp b/include/mbgl/util/raster.hpp index 9124f59ba7..e526ffa5ac 100644 --- a/include/mbgl/util/raster.hpp +++ b/include/mbgl/util/raster.hpp @@ -28,7 +28,7 @@ public: // bind prerendered texture void bind(const GLuint texture); - + // loaded status bool isLoaded() const; |