diff options
author | Jason Wray <jason@mapbox.com> | 2018-04-11 17:34:48 -0400 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2018-04-11 17:40:53 -0400 |
commit | d9211a4329f7d7b95ac812ab68831fe14de4089a (patch) | |
tree | b9322a480e14148f554f614f816faa87a8d59d45 | |
parent | f0f67b4788f967ee34f307312db302cecb68dd0b (diff) | |
download | qtlocation-mapboxgl-d9211a4329f7d7b95ac812ab68831fe14de4089a.tar.gz |
[ios] Cast MGLOpenGLStyleLayer's projection transform to CGFloat
CATransform3D's matrix is internally typed as CGFloat, which we were implicitly casting to from double. The `-Wc++11-narrowing` flag disallows implicit narrowing casts, so this makes it explicit.
> non-constant-expression cannot be narrowed from type 'std::__1::array<double, 16>::value_type' (aka 'double') to 'CGFloat' (aka 'float') in initializer list [-Wc++11-narrowing]
-rw-r--r-- | platform/darwin/src/MGLOpenGLStyleLayer.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLOpenGLStyleLayer.mm b/platform/darwin/src/MGLOpenGLStyleLayer.mm index 2389888632..6d132ac00e 100644 --- a/platform/darwin/src/MGLOpenGLStyleLayer.mm +++ b/platform/darwin/src/MGLOpenGLStyleLayer.mm @@ -10,10 +10,10 @@ CATransform3D CATransform3DMake(std::array<double, 16> array) { CATransform3D t = { - .m11 = array[0], .m12 = array[1], .m13 = array[2], .m14 = array[3], - .m21 = array[4], .m22 = array[5], .m23 = array[6], .m24 = array[7], - .m31 = array[8], .m32 = array[9], .m33 = array[10], .m34 = array[11], - .m41 = array[12], .m42 = array[13], .m43 = array[14], .m44 = array[15] + .m11 = static_cast<CGFloat>(array[0]), .m12 = static_cast<CGFloat>(array[1]), .m13 = static_cast<CGFloat>(array[2]), .m14 = static_cast<CGFloat>(array[3]), + .m21 = static_cast<CGFloat>(array[4]), .m22 = static_cast<CGFloat>(array[5]), .m23 = static_cast<CGFloat>(array[6]), .m24 = static_cast<CGFloat>(array[7]), + .m31 = static_cast<CGFloat>(array[8]), .m32 = static_cast<CGFloat>(array[9]), .m33 = static_cast<CGFloat>(array[10]), .m34 = static_cast<CGFloat>(array[11]), + .m41 = static_cast<CGFloat>(array[12]), .m42 = static_cast<CGFloat>(array[13]), .m43 = static_cast<CGFloat>(array[14]), .m44 = static_cast<CGFloat>(array[15]) }; return t; } |