X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffreetype.cc;h=03a37e716b90d6d99035c35ad0023fae691b07a3;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d7d4843ce8be17504b0e132b1fbfde45d71b04d1;hpb=f0eca19f1dc9ffddf98eadf39800405fe4d3e7a5;p=lilypond.git

diff --git a/lily/freetype.cc b/lily/freetype.cc
index d7d4843ce8..03a37e716b 100644
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 #include "freetype.hh"
 #include "warn.hh"
 
-#include <freetype/ftoutln.h>
-#include <freetype/ftbbox.h>
+#include FT_OUTLINE_H
+#include FT_BBOX_H
 
 FT_Library freetype2_library;
 
@@ -159,32 +159,14 @@ ly_FT_get_glyph_outline (FT_Face const &face, size_t signed_idx)
           Real y1 = outline->points[j].y;
           Real y2 = outline->points[j + 1].y;
 
-          Real qx2 = x0 + x2 - (2 * x1);
-          Real qx1 = (2 * x1) - (2 * x0);
-          Real qx0 = x0;
-
-          Real qy2 = y0 + y2 - (2 * y1);
-          Real qy1 = (2 * y1) - (2 * y0);
-          Real qy0 = y0;
-
-          Real cx0 = qx0;
-          Real cx1 = qx0 + (qx1 / 3);
-          Real cx2 = qx0 + (2 * qx1 / 3) + (qx2 / 3);
-          Real cx3 = qx0 + qx1 + qx2;
-
-          Real cy0 = qy0;
-          Real cy1 = qy0 + (qy1 / 3);
-          Real cy2 = qy0 + (2 * qy1 / 3) + (qy2 / 3);
-          Real cy3 = qy0 + qy1 + qy2;
-
-          out = scm_cons (scm_list_n (scm_from_double (cx0),
-                                      scm_from_double (cy0),
-                                      scm_from_double (cx1),
-                                      scm_from_double (cy1),
-                                      scm_from_double (cx2),
-                                      scm_from_double (cy2),
-                                      scm_from_double (cx3),
-                                      scm_from_double (cy3),
+          out = scm_cons (scm_list_n (scm_from_double (x0),
+                                      scm_from_double (y0),
+                                      scm_from_double ((x0 + 2*x1)/3),
+                                      scm_from_double ((y0 + 2*y1)/3),
+                                      scm_from_double ((2*x1 + x2)/3),
+                                      scm_from_double ((2*y1 + y2)/3),
+                                      scm_from_double (x2),
+                                      scm_from_double (y2),
                                       SCM_UNDEFINED),
                           out);
           lastpos = Offset (outline->points[j + 1].x, outline->points[j + 1].y);