Imported Upstream version 2.14.2

[lilypond.git] / lily / freetype-error.cc

diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
index 8e5d435bc676776e1dcd2e92a45612eff0e20c40..21cec3311164d650ec4334b4a6b1aa899bb20ee1 100644 (file)
--- a/lily/freetype-error.cc
+++ b/lily/freetype-error.cc
@@ -1,10 +1,21 @@
-/* 
-  freetype-error.cc -- implement freetype error messages
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2007--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2007--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
   
+
+  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"
@@ -16,7 +27,7 @@
                                                                          
 const struct Freetype_error_message
 {                                                               
-  int          err_code;                                        
+  FT_Error     err_code;                                        
   const char*  err_msg;
 } ft_errors[] =                                                 
                                                                          
@@ -28,7 +39,7 @@ const struct Freetype_error_message
 #include <string>
 
 string
-freetype_error_string (int code)
+freetype_error_string (FT_Error code)
 {
   for (Freetype_error_message const *p = ft_errors;
        p->err_msg; p ++)