[gimp/soc-2012-unified-transformation] ===squash=== fix a mis-rebase (aka i didn't even compile this)

[Mikael Magnusson <mikachu src gnome org>]

commit ecb7c32b64190902c6d3da2da97e8d2d82e9317f
Author: Mikael Magnusson <mikachu src gnome org>
Date:   Tue Jul 17 19:32:01 2012 +0200

    ===squash=== fix a mis-rebase (aka i didn't even compile this)

 app/tools/gimpunifiedtransformationtool.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/app/tools/gimpunifiedtransformationtool.c b/app/tools/gimpunifiedtransformationtool.c
index 57323ee..bc65b5e 100644
--- a/app/tools/gimpunifiedtransformationtool.c
+++ b/app/tools/gimpunifiedtransformationtool.c
@@ -27,8 +27,8 @@
 
 #include "tools-types.h"
 
-#include "base/boundary.h"
 
+#include "core/gimpboundary.h"
 #include "core/gimpchannel.h"
 #include "core/gimp-transform-utils.h"
 #include "core/gimpimage.h"
@@ -376,7 +376,6 @@ gimp_unified_transformation_tool_draw (GimpDrawTool *draw_tool)
                                GIMP_HANDLE_ANCHOR_CENTER);
 
   /*  draw the shear handles  */
-  /*the math here is a bit wrong but it'll do for now*/
   x = (tr_tool->tx1 * 2 + tr_tool->tx2 * 3) / 5;
   y = (tr_tool->ty1 * 2 + tr_tool->ty2 * 3) / 5;
 
@@ -492,21 +491,21 @@ gimp_unified_transformation_tool_draw (GimpDrawTool *draw_tool)
   /* the rest of the function is the same as in the parent class */
   if (options->type == GIMP_TRANSFORM_TYPE_SELECTION)
     {
-      GimpMatrix3     matrix = tr_tool->transform;
-      const BoundSeg *orig_in;
-      const BoundSeg *orig_out;
-      BoundSeg       *segs_in;
-      BoundSeg       *segs_out;
-      gint            num_segs_in;
-      gint            num_segs_out;
+      GimpMatrix3         matrix = tr_tool->transform;
+      const GimpBoundSeg *orig_in;
+      const GimpBoundSeg *orig_out;
+      GimpBoundSeg       *segs_in;
+      GimpBoundSeg       *segs_out;
+      gint                num_segs_in;
+      gint                num_segs_out;
 
       gimp_channel_boundary (gimp_image_get_mask (image),
                              &orig_in, &orig_out,
                              &num_segs_in, &num_segs_out,
                              0, 0, 0, 0);
 
-      segs_in  = g_memdup (orig_in,  num_segs_in  * sizeof (BoundSeg));
-      segs_out = g_memdup (orig_out, num_segs_out * sizeof (BoundSeg));
+      segs_in  = g_memdup (orig_in,  num_segs_in  * sizeof (GimpBoundSeg));
+      segs_out = g_memdup (orig_out, num_segs_out * sizeof (GimpBoundSeg));
 
       if (segs_in)
         {