Merge branch 'master' into compatibility

src/Primitives/Circle.cpp

@@ -42,8 +42,10 @@ Trade::MeshData2D Circle::solid(UnsignedInt segments) {
 
     /* Points on circle */
     const Rad angleIncrement(2*Constants::pi()/segments);
-    for(UnsignedInt i = 0; i != segments; ++i)
-        positions->emplace_back(Math::cos(i*angleIncrement), Math::sin(i*angleIncrement));
+    for(UnsignedInt i = 0; i != segments; ++i) {
+        const Rad angle(i*angleIncrement);
+        positions->emplace_back(Math::cos(angle), Math::sin(angle));
+    }
 
     return Trade::MeshData2D(Mesh::Primitive::TriangleFan, nullptr, {positions}, {});
 }
@@ -57,8 +59,10 @@ Trade::MeshData2D Circle::wireframe(UnsignedInt segments) {
 
     /* Points on circle */
     const Rad angleIncrement(2*Constants::pi()/segments);
-    for(UnsignedInt i = 0; i != segments; ++i)
-        positions->emplace_back(Math::cos(i*angleIncrement), Math::sin(i*angleIncrement));
+    for(UnsignedInt i = 0; i != segments; ++i) {
+        const Rad angle(i*angleIncrement);
+        positions->emplace_back(Math::cos(angle), Math::sin(angle));
+    }
 
     return Trade::MeshData2D(Mesh::Primitive::LineLoop, nullptr, {positions}, {});
 }

src/Trade/AbstractImageConverter.cpp

@@ -41,9 +41,9 @@ Image2D* AbstractImageConverter::convertToImage(const Image2D* const) const {
 
 std::pair<const unsigned char*, std::size_t> AbstractImageConverter::convertToData(const Image2D* const) const {
     CORRADE_ASSERT(features() & Feature::ConvertToData,
-        "Trade::AbstractImageConverter::convertToData(): feature advertised but not implemented", std::make_pair(nullptr, 0));
+        "Trade::AbstractImageConverter::convertToData(): feature advertised but not implemented", {});
 
-    CORRADE_ASSERT(false, "Trade::AbstractImageConverter::convertToData(): feature not implemented", std::make_pair(nullptr, 0));
+    CORRADE_ASSERT(false, "Trade::AbstractImageConverter::convertToData(): feature not implemented", {});
 }
 
 bool AbstractImageConverter::convertToFile(const Image2D* const, const std::string&) const {