Merge lp:~afrantzis/mir/fix-1286010 into lp:mir

[Alexandros Frantzis]

Fix glm build warnings

Fix glm build warnings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/752
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/757
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/755
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/713
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4614

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1020/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'examples/image_renderer.cpp'
--- examples/image_renderer.cpp	2014-03-04 04:09:36 +0000
+++ examples/image_renderer.cpp	2014-03-10 11:11:24 +0000
@@ -23,6 +23,7 @@
 #pragma GCC diagnostic warning "-Wall"
 #include <glm/glm.hpp>
 #pragma GCC diagnostic pop
+#define GLM_FORCE_RADIANS
 #include <glm/gtc/type_ptr.hpp>
 
 #include <memory>
 
=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2014-03-06 19:05:47 +0000
+++ examples/render_surfaces.cpp	2014-03-10 11:11:24 +0000
@@ -49,8 +49,6 @@
 #include <sstream>
 #include <vector>
 
-#include <glm/gtc/matrix_transform.hpp>
-
 namespace mg = mir::graphics;
 namespace mc = mir::compositor;
 namespace ms = mir::scene;
 
=== modified file 'include/test/mir_test_doubles/fake_renderable.h'
--- include/test/mir_test_doubles/fake_renderable.h	2014-03-06 05:29:00 +0000
+++ include/test/mir_test_doubles/fake_renderable.h	2014-03-10 11:11:24 +0000
@@ -20,6 +20,7 @@
 #define MIR_TEST_DOUBLES_FAKE_RENDERABLE_H_
 
 #include "mir/graphics/renderable.h"
+#define GLM_FORCE_RADIANS
 #include <glm/gtc/matrix_transform.hpp>
 #include <gmock/gmock.h>
 
 
=== modified file 'src/server/compositor/gl_renderer.cpp'
--- src/server/compositor/gl_renderer.cpp	2014-03-04 04:09:36 +0000
+++ src/server/compositor/gl_renderer.cpp	2014-03-10 11:11:24 +0000
@@ -20,6 +20,7 @@
 #include "mir/graphics/renderable.h"
 #include "mir/graphics/buffer.h"
 
+#define GLM_FORCE_RADIANS
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 
=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp	2014-03-06 19:05:47 +0000
+++ src/server/scene/basic_surface.cpp	2014-03-10 11:11:24 +0000
@@ -25,6 +25,7 @@
 
 #include "mir/scene/scene_report.h"
 
+#define GLM_FORCE_RADIANS
 #include <glm/gtc/matrix_transform.hpp>
 
 #include <boost/throw_exception.hpp>
@@ -241,7 +242,7 @@
 {
     {
         std::unique_lock<std::mutex> lk(guard);
-        rotation_matrix = glm::rotate(glm::mat4(1.0f), degrees, axis);
+        rotation_matrix = glm::rotate(glm::mat4(1.0f), glm::radians(degrees), axis);
         transformation_dirty = true;
     }
     notify_change();