From 786707649a2efcddd24fb976150b044097d74219 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 16 May 2017 13:44:12 -0700 Subject: [core] Remove ambiguous get{Width,Height} accessors from style::Image --- include/mbgl/style/image.hpp | 3 --- platform/macos/src/NSImage+MGLAdditions.mm | 4 +++- src/mbgl/sprite/sprite_atlas.cpp | 10 +++++----- src/mbgl/style/image.cpp | 8 -------- src/mbgl/style/image_impl.hpp | 3 --- test/sprite/sprite_parser.test.cpp | 10 ---------- test/style/style_image.test.cpp | 4 ---- 7 files changed, 8 insertions(+), 34 deletions(-) diff --git a/include/mbgl/style/image.hpp b/include/mbgl/style/image.hpp index 3877086bd6..53cab23c2f 100644 --- a/include/mbgl/style/image.hpp +++ b/include/mbgl/style/image.hpp @@ -22,9 +22,6 @@ public: // Whether this image should be interpreted as a signed distance field icon. bool isSdf() const; - float getWidth() const; - float getHeight() const; - class Impl; Immutable impl; }; diff --git a/platform/macos/src/NSImage+MGLAdditions.mm b/platform/macos/src/NSImage+MGLAdditions.mm index 6bb8fca68b..ecd8aabe15 100644 --- a/platform/macos/src/NSImage+MGLAdditions.mm +++ b/platform/macos/src/NSImage+MGLAdditions.mm @@ -23,7 +23,9 @@ NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithCGImage:image]; CGImageRelease(image); - if (self = [self initWithSize:NSMakeSize(styleImage->getWidth(), styleImage->getHeight())]) { + CGFloat w = styleImage->getImage().size.width / styleImage->getPixelRatio(); + CGFloat h = styleImage->getImage().size.height / styleImage->getPixelRatio(); + if (self = [self initWithSize:NSMakeSize(w, h)]) { [self addRepresentation:rep]; [self setTemplate:styleImage->isSdf()]; } diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 2175077c1f..20c062a779 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -22,14 +22,14 @@ SpriteAtlasElement::SpriteAtlasElement(Rect rect_, : pos(std::move(rect_)), sdf(image.sdf), relativePixelRatio(image.pixelRatio / pixelRatio), - width(image.getWidth()), - height(image.getHeight()) { + width(image.image.size.width / image.pixelRatio), + height(image.image.size.height / image.pixelRatio) { - const float w = image.getWidth() * relativePixelRatio; - const float h = image.getHeight() * relativePixelRatio; + const float w = image.image.size.width / pixelRatio; + const float h = image.image.size.height / pixelRatio; - size = {{ float(image.getWidth()), image.getHeight() }}; + size = {{ width, height }}; tl = {{ float(pos.x + padding) / size_.width, float(pos.y + padding) / size_.height }}; br = {{ float(pos.x + padding + w) / size_.width, float(pos.y + padding + h) / size_.height }}; } diff --git a/src/mbgl/style/image.cpp b/src/mbgl/style/image.cpp index 3b35fa76f1..0cce32ab98 100644 --- a/src/mbgl/style/image.cpp +++ b/src/mbgl/style/image.cpp @@ -28,13 +28,5 @@ float Image::getPixelRatio() const { return impl->pixelRatio; } -float Image::getWidth() const { - return impl->getWidth(); -} - -float Image::getHeight() const { - return impl->getHeight(); -} - } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/image_impl.hpp b/src/mbgl/style/image_impl.hpp index b088a23261..aa2cad8278 100644 --- a/src/mbgl/style/image_impl.hpp +++ b/src/mbgl/style/image_impl.hpp @@ -18,9 +18,6 @@ public: // Whether this image should be interpreted as a signed distance field icon. const bool sdf; - - float getWidth() const { return image.size.width / pixelRatio; } - float getHeight() const { return image.size.height / pixelRatio; } }; } // namespace style diff --git a/test/sprite/sprite_parser.test.cpp b/test/sprite/sprite_parser.test.cpp index aad80b3d81..529e4c75e8 100644 --- a/test/sprite/sprite_parser.test.cpp +++ b/test/sprite/sprite_parser.test.cpp @@ -143,8 +143,6 @@ TEST(Sprite, SpriteImageCreation1x) { { // "museum_icon":{"x":177,"y":187,"width":18,"height":18,"pixelRatio":1,"sdf":false} const auto sprite = createStyleImage("test", image_1x, 177, 187, 18, 18, 1, false); ASSERT_TRUE(sprite.get()); - EXPECT_EQ(18, sprite->getWidth()); - EXPECT_EQ(18, sprite->getHeight()); EXPECT_EQ(18u, sprite->getImage().size.width); EXPECT_EQ(18u, sprite->getImage().size.height); EXPECT_EQ(1, sprite->getPixelRatio()); @@ -159,8 +157,6 @@ TEST(Sprite, SpriteImageCreation2x) { // "museum_icon":{"x":354,"y":374,"width":36,"height":36,"pixelRatio":2,"sdf":false} const auto sprite = createStyleImage("test", image_2x, 354, 374, 36, 36, 2, false); ASSERT_TRUE(sprite.get()); - EXPECT_EQ(18, sprite->getWidth()); - EXPECT_EQ(18, sprite->getHeight()); EXPECT_EQ(36u, sprite->getImage().size.width); EXPECT_EQ(36u, sprite->getImage().size.height); EXPECT_EQ(2, sprite->getPixelRatio()); @@ -174,8 +170,6 @@ TEST(Sprite, SpriteImageCreation1_5x) { // "museum_icon":{"x":354,"y":374,"width":36,"height":36,"pixelRatio":2,"sdf":false} const auto sprite = createStyleImage("test", image_2x, 354, 374, 36, 36, 1.5, false); ASSERT_TRUE(sprite.get()); - EXPECT_EQ(24, sprite->getWidth()); - EXPECT_EQ(24, sprite->getHeight()); EXPECT_EQ(36u, sprite->getImage().size.width); EXPECT_EQ(36u, sprite->getImage().size.height); EXPECT_EQ(1.5, sprite->getPixelRatio()); @@ -185,8 +179,6 @@ TEST(Sprite, SpriteImageCreation1_5x) { // "hospital_icon":{"x":314,"y":518,"width":36,"height":36,"pixelRatio":2,"sdf":false} const auto sprite2 = createStyleImage("test", image_2x, 314, 518, 35, 35, 1.5, false); ASSERT_TRUE(sprite2.get()); - EXPECT_EQ(float(35 / 1.5), sprite2->getWidth()); - EXPECT_EQ(float(35 / 1.5), sprite2->getHeight()); EXPECT_EQ(35u, sprite2->getImage().size.width); EXPECT_EQ(35u, sprite2->getImage().size.height); EXPECT_EQ(1.5, sprite2->getPixelRatio()); @@ -281,8 +273,6 @@ TEST(Sprite, SpriteParsing) { { auto& sprite = *std::find_if(images.begin(), images.end(), [] (const auto& image) { return image->getID() == "generic-metro"; }); - EXPECT_EQ(18, sprite->getWidth()); - EXPECT_EQ(18, sprite->getHeight()); EXPECT_EQ(18u, sprite->getImage().size.width); EXPECT_EQ(18u, sprite->getImage().size.height); EXPECT_EQ(1, sprite->getPixelRatio()); diff --git a/test/style/style_image.test.cpp b/test/style/style_image.test.cpp index c535397be3..e49bf37582 100644 --- a/test/style/style_image.test.cpp +++ b/test/style/style_image.test.cpp @@ -35,18 +35,14 @@ TEST(StyleImage, ZeroRatio) { TEST(StyleImage, Retina) { style::Image image("test", PremultipliedImage({ 32, 24 }), 2.0); - EXPECT_EQ(16, image.getWidth()); EXPECT_EQ(32u, image.getImage().size.width); - EXPECT_EQ(12, image.getHeight()); EXPECT_EQ(24u, image.getImage().size.height); EXPECT_EQ(2, image.getPixelRatio()); } TEST(StyleImage, FractionalRatio) { style::Image image("test", PremultipliedImage({ 20, 12 }), 1.5); - EXPECT_EQ(float(20.0 / 1.5), image.getWidth()); EXPECT_EQ(20u, image.getImage().size.width); - EXPECT_EQ(float(12.0 / 1.5), image.getHeight()); EXPECT_EQ(12u, image.getImage().size.height); EXPECT_EQ(1.5, image.getPixelRatio()); } -- cgit v1.2.1