Imported Upstream version 2.16.0

[lilypond.git] / lily / freetype.cc

diff --git a/lily/freetype.cc b/lily/freetype.cc
index 57db56909cb385af15343d2a3f4bd3a5251a81fb..f19b1649686225c8bc4f67b5bcf555d5a24096da 100644 (file)
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -1,10 +1,20 @@
 /*
-  freetype.cc -- implement Freetype routines.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "freetype.hh"
@@ -12,14 +22,11 @@
 
 FT_Library freetype2_library;
 
-
 void
-init_freetype()
+init_freetype ()
 {
-  int errorcode = FT_Init_FreeType( &freetype2_library );
+  FT_Error errorcode = FT_Init_FreeType (&freetype2_library);
   if (errorcode)
-    {
-      error("Could  not initialize freetype");
-    }
+    error ("cannot initialize FreeType");
 }