Set merge from trunk

[inkscape.git] / src / axis-manip.cpp

diff --git a/src/axis-manip.cpp b/src/axis-manip.cpp
index c2edbfb89d06da593b8bb2b55b3d189887149e26..1dfa0e6bf8fd48575d3018b14dcf7e25805ed2b7 100644 (file)
--- a/src/axis-manip.cpp
+++ b/src/axis-manip.cpp
@@ -13,6 +13,13 @@
 
 #include "axis-manip.h"
 
+namespace Proj {
+
+Axis axes[4]   = { X,  Y,  Z, W };
+
+} // namespace Proj
+
+
 namespace Box3D {
 
 Axis axes[3]   = { X,  Y,  Z };
@@ -22,7 +29,7 @@ FrontOrRear face_positions [2] = { FRONT, REAR };
 std::pair <Axis, Axis>
 get_remaining_axes (Axis axis) {
     if (!is_single_axis_direction (axis)) return std::make_pair (NONE, NONE);
-    Axis plane = orth_plane (axis);
+    Axis plane = orth_plane_or_axis (axis);
     return std::make_pair (extract_first_axis_direction (plane), extract_second_axis_direction (plane));
 }
 
@@ -37,4 +44,4 @@ get_remaining_axes (Axis axis) {
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :