From aad41ee023fd114dc606415854b4e572364139bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 2 Jan 2014 15:10:03 +0100
Subject: [PATCH] Rename some admesh functions to preserve compatibility with
 oiriginal admesh #1525

---
 xs/src/TriangleMesh.cpp | 4 ++--
 xs/src/admesh/stl.h     | 4 ++--
 xs/src/admesh/util.c    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xs/src/TriangleMesh.cpp b/xs/src/TriangleMesh.cpp
index 2aadce4f5..debd2155c 100644
--- a/xs/src/TriangleMesh.cpp
+++ b/xs/src/TriangleMesh.cpp
@@ -139,12 +139,12 @@ void TriangleMesh::scale(std::vector<double> versor)
     fversor[0] = versor[0];
     fversor[1] = versor[1];
     fversor[2] = versor[2];
-    stl_scale(&this->stl, fversor);
+    stl_scale_versor(&this->stl, fversor);
 }
 
 void TriangleMesh::translate(float x, float y, float z)
 {
-    stl_translate(&(this->stl), x, y, z);
+    stl_translate_relative(&(this->stl), x, y, z);
 }
 
 void TriangleMesh::align_to_origin()
diff --git a/xs/src/admesh/stl.h b/xs/src/admesh/stl.h
index ac4143858..507ec9d64 100644
--- a/xs/src/admesh/stl.h
+++ b/xs/src/admesh/stl.h
@@ -154,8 +154,8 @@ extern void stl_fill_holes(stl_file *stl);
 extern void stl_fix_normal_directions(stl_file *stl);
 extern void stl_fix_normal_values(stl_file *stl);
 extern void stl_reverse_all_facets(stl_file *stl);
-extern void stl_translate(stl_file *stl, float x, float y, float z);
-extern void stl_scale(stl_file *stl, float versor[3]);
+extern void stl_translate_relative(stl_file *stl, float x, float y, float z);
+extern void stl_scale_versor(stl_file *stl, float versor[3]);
 extern void stl_scale(stl_file *stl, float factor);
 extern void stl_rotate_x(stl_file *stl, float angle);
 extern void stl_rotate_y(stl_file *stl, float angle);
diff --git a/xs/src/admesh/util.c b/xs/src/admesh/util.c
index 65a226aba..84e9c1191 100644
--- a/xs/src/admesh/util.c
+++ b/xs/src/admesh/util.c
@@ -77,7 +77,7 @@ stl_verify_neighbors(stl_file *stl)
 }
 
 void
-stl_translate(stl_file *stl, float x, float y, float z)
+stl_translate_relative(stl_file *stl, float x, float y, float z)
 {
   int i;
   int j;
@@ -102,7 +102,7 @@ stl_translate(stl_file *stl, float x, float y, float z)
 }
 
 void
-stl_scale(stl_file *stl, float versor[3])
+stl_scale_versor(stl_file *stl, float versor[3])
 {
   int i;
   int j;
@@ -145,7 +145,7 @@ stl_scale(stl_file *stl, float factor)
     versor[0] = factor;
     versor[1] = factor;
     versor[2] = factor;
-    stl_scale(stl, versor);
+    stl_scale_versor(stl, versor);
 }
 
 static void calculate_normals(stl_file *stl)