X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffreetype-error.cc;h=4588518d0367b4eeaccdf19d8796e6d589eaa46a;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=683671146c350055e2793cbd7f6627afe4bb84d2;hpb=209910ea2fdac61374a41537456f16eb1df25a21;p=lilypond.git

diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
index 683671146c..4588518d03 100644
--- a/lily/freetype-error.cc
+++ b/lily/freetype-error.cc
@@ -1,42 +1,52 @@
-/* 
-  freetype-error.cc -- implement freetype error messages
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2007 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2007--2014 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"
 
-#undef __FTERRORS_H__                                           
-#define FT_ERRORDEF( e, v, s )  { e, s },                       
-#define FT_ERROR_START_LIST     {                               
-#define FT_ERROR_END_LIST       { 0, 0 } };                     
-                                                                         
+#undef __FTERRORS_H__
+#define FT_ERRORDEF(e, v, s)  { e, s },
+#define FT_ERROR_START_LIST     {
+#define FT_ERROR_END_LIST       { 0, 0 } };
+
 const struct Freetype_error_message
-{                                                               
-  int          err_code;                                        
-  const char*  err_msg;
-} ft_errors[] =                                                 
-                                                                         
-#include <freetype/fterrors.h>
+{
+  FT_Error err_code;
+  const char *err_msg;
+} ft_errors[] =
 
-  ;
+#include FT_ERRORS_H
 
+  ;
 
 #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 ++)
+       p->err_msg; p++)
     {
       if (p->err_code == code)
-	return p->err_msg;
+        return p->err_msg;
     }
 
-  return "<unknown error>"; 
+  return "<unknown error>";
 }
-  
+