summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-17 13:07:27 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-18 23:46:50 +0300
commitc20c1d6a6b3eb301db88ca3e74993f445cc4d839 (patch)
tree7011952bc5cc49d62b2be4b96ba3c3c7bbd3e54d /src/mbgl/sprite
parent41497e9c4174d310f3a62548f3cfeb9da2852849 (diff)
downloadqtlocation-mapboxgl-c20c1d6a6b3eb301db88ca3e74993f445cc4d839.tar.gz
[core] Avoid redundant 'inline' usage
Diffstat (limited to 'src/mbgl/sprite')
-rw-r--r--src/mbgl/sprite/sprite_atlas.hpp16
-rw-r--r--src/mbgl/sprite/sprite_parser.cpp6
2 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp
index 5d8e05a60c..4d1ee1c38c 100644
--- a/src/mbgl/sprite/sprite_atlas.hpp
+++ b/src/mbgl/sprite/sprite_atlas.hpp
@@ -56,14 +56,14 @@ public:
// the texture is only bound when the data is out of date (=dirty).
void upload(gl::ObjectStore&);
- inline dimension getWidth() const { return width; }
- inline dimension getHeight() const { return height; }
- inline dimension getTextureWidth() const { return pixelWidth; }
- inline dimension getTextureHeight() const { return pixelHeight; }
- inline float getPixelRatio() const { return pixelRatio; }
+ dimension getWidth() const { return width; }
+ dimension getHeight() const { return height; }
+ dimension getTextureWidth() const { return pixelWidth; }
+ dimension getTextureHeight() const { return pixelHeight; }
+ float getPixelRatio() const { return pixelRatio; }
// Only for use in tests.
- inline const uint32_t* getData() const { return data.get(); }
+ const uint32_t* getData() const { return data.get(); }
private:
const GLsizei width, height;
@@ -71,8 +71,8 @@ private:
const float pixelRatio;
struct Holder : private util::noncopyable {
- inline Holder(std::shared_ptr<const SpriteImage>, Rect<dimension>);
- inline Holder(Holder&&);
+ Holder(std::shared_ptr<const SpriteImage>, Rect<dimension>);
+ Holder(Holder&&);
std::shared_ptr<const SpriteImage> spriteImage;
const Rect<dimension> pos;
};
diff --git a/src/mbgl/sprite/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp
index 9fbca51112..190ac66e14 100644
--- a/src/mbgl/sprite/sprite_parser.cpp
+++ b/src/mbgl/sprite/sprite_parser.cpp
@@ -46,7 +46,7 @@ SpriteImagePtr createSpriteImage(const PremultipliedImage& image,
namespace {
-inline uint16_t getUInt16(const JSValue& value, const char* name, const uint16_t def = 0) {
+uint16_t getUInt16(const JSValue& value, const char* name, const uint16_t def = 0) {
if (value.HasMember(name)) {
auto& v = value[name];
if (v.IsUint() && v.GetUint() <= std::numeric_limits<uint16_t>::max()) {
@@ -60,7 +60,7 @@ inline uint16_t getUInt16(const JSValue& value, const char* name, const uint16_t
return def;
}
-inline double getDouble(const JSValue& value, const char* name, const double def = 0) {
+double getDouble(const JSValue& value, const char* name, const double def = 0) {
if (value.HasMember(name)) {
auto& v = value[name];
if (v.IsNumber()) {
@@ -73,7 +73,7 @@ inline double getDouble(const JSValue& value, const char* name, const double def
return def;
}
-inline bool getBoolean(const JSValue& value, const char* name, const bool def = false) {
+bool getBoolean(const JSValue& value, const char* name, const bool def = false) {
if (value.HasMember(name)) {
auto& v = value[name];
if (v.IsBool()) {