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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 201c072e75e9f61307e1c46be9a7ef3ecbd043b3
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jan 16 10:56:08 2009 +1100

    Bug fix for ppmcombine
    
    darcs-hash:20090115235608-d4795-351d4af59375f96971bb13df756abf2d36dbd762.gz

diff --git a/src/graphic.c b/src/graphic.c
index a3a560e..ec4bc90 100644
--- a/src/graphic.c
+++ b/src/graphic.c
@@ -749,7 +749,7 @@ gint gfs_combine_ppm (gchar ** fname, guint nname, FILE * fp)
       for (y = 0; y < image[i]->height; y++)
 	for (x = 0; x < image[i]->width; x++) {
 	  gint x1 = x + image[i]->min.x - combo->min.x;
-	  gint y1 = y + image[i]->min.y - combo->min.y;
+	  gint y1 = y + combo->min.y + combo->height - image[i]->min.y - image[i]->height;
 	  guchar r = image[i]->data[y][x][0];
 	  guchar g = image[i]->data[y][x][1];
 	  guchar b = image[i]->data[y][x][2];
@@ -764,6 +764,7 @@ gint gfs_combine_ppm (gchar ** fname, guint nname, FILE * fp)
     image_write (combo, fp);
     image_destroy (combo);
   }
+  gfs_combine_close (f, image, nname, 0);
 }
 
 static void write_square (FttCell * cell, gpointer * data)

-- 
Gerris Flow Solver