[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0282c14784449149edd55a3e6c6a3a69cfb29506
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Apr 25 08:15:42 2007 +1000

    Bug fix for GfsSurface transformations
    
    darcs-hash:20070424221542-d4795-2ebda3bdb048ab5156d284e1254d83b785af6dd3.gz

diff --git a/src/surface.c b/src/surface.c
index e7d9f72..96e77ed 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -150,12 +150,15 @@ static void surface_read (GtsObject ** o, GtsFile * fp)
     if (fp->type == GTS_ERROR)
       return;
 
-    if (var[9].set)
-      surface->scale[0] = surface->scale[1] = surface->scale[2] = scale;
-    
+    if (var[9].set) {
+      surface->scale[0] *= scale;
+      surface->scale[1] *= scale;
+      surface->scale[2] *= scale;
+    }
+
     GtsMatrix * m = gts_matrix_translate (NULL, surface->translate);
-    FttComponent c;
-    for (c = 3; c >= 0; c--)
+    gint c;
+    for (c = 2; c >= 0; c--)
       if (surface->rotate[c] != 0.) {
 	GtsVector r = {0.,0.,0.};
 	r[c] = 1.;

-- 
Gerris Flow Solver