# HG changeset patch
# User Rik <rik@octave.org>
# Date 1399477196 25200
# Node ID 333901476119d5fedd302310b7ee85a43544fa0e
# Parent  28eab2d8419058ae3b4b8224dd3be79ea9c0d8fc
maint: Use "FreeType" rather than "freetype" in messages and comments.

* gl-render.h, gl2ps-renderer.cc, graphics.in.h, txt-eng-ft.cc, txt-eng-ft.h:
Use "FreeType" rather than "freetype" in messages and comments.

diff -r 28eab2d84190 -r 333901476119 libinterp/corefcn/gl-render.h
--- a/libinterp/corefcn/gl-render.h	Mon Apr 21 17:17:15 2014 +0200
+++ b/libinterp/corefcn/gl-render.h	Wed May 07 08:39:56 2014 -0700
@@ -200,7 +200,7 @@
   ColumnVector camera_pos, camera_dir;
 
 #if HAVE_FREETYPE
-  // freetype render, used for text rendering
+  // FreeType render, used for text rendering
   ft_render text_renderer;
 #endif
 
diff -r 28eab2d84190 -r 333901476119 libinterp/corefcn/gl2ps-renderer.cc
--- a/libinterp/corefcn/gl2ps-renderer.cc	Mon Apr 21 17:17:15 2014 +0200
+++ b/libinterp/corefcn/gl2ps-renderer.cc	Wed May 07 08:39:56 2014 -0700
@@ -161,7 +161,7 @@
                 alignment_to_mode (ha, va), rotation);
 
   // FIXME?
-  // We have no way of getting a bounding box from gl2ps, so we use freetype.
+  // We have no way of getting a bounding box from gl2ps, so we use FreeType.
   Matrix bbox;
   uint8NDArray pixels;
   text_to_pixels (txt, pixels, bbox, 0, 0, rotation);
diff -r 28eab2d84190 -r 333901476119 libinterp/corefcn/graphics.in.h
--- a/libinterp/corefcn/graphics.in.h	Mon Apr 21 17:17:15 2014 +0200
+++ b/libinterp/corefcn/graphics.in.h	Wed May 07 08:39:56 2014 -0700
@@ -3758,7 +3758,7 @@
     bool xySym, xyzSym, zSign, nearhoriz;
 
 #if HAVE_FREETYPE
-    // freetype renderer, used for calculation of text (tick labels) size
+    // FreeType renderer, used for calculation of text (tick labels) size
     ft_render text_renderer;
 #endif
 
@@ -4432,7 +4432,7 @@
     Matrix get_extent_matrix (void) const;
     const uint8NDArray& get_pixels (void) const { return pixels; }
 #if HAVE_FREETYPE
-    // freetype renderer, used for calculation of text size
+    // FreeType renderer, used for calculation of text size
     ft_render renderer;
 #endif
 
diff -r 28eab2d84190 -r 333901476119 libinterp/corefcn/txt-eng-ft.cc
--- a/libinterp/corefcn/txt-eng-ft.cc	Mon Apr 21 17:17:15 2014 +0200
+++ b/libinterp/corefcn/txt-eng-ft.cc	Wed May 07 08:39:56 2014 -0700
@@ -121,7 +121,7 @@
   typedef std::pair<std::string, double> ft_key;
   typedef std::map<ft_key, FT_Face> ft_cache;
 
-  // Cache the fonts loaded by freetype. This cache only contains
+  // Cache the fonts loaded by FreeType. This cache only contains
   // weak references to the fonts, strong references are only present
   // in class ft_render.
   ft_cache cache;
@@ -138,7 +138,7 @@
     : library (), freetype_initialized (false), fontconfig_initialized (false)
   {
     if (FT_Init_FreeType (&library))
-      ::error ("unable to initialize freetype library");
+      ::error ("unable to initialize FreeType library");
     else
       freetype_initialized = true;
 
diff -r 28eab2d84190 -r 333901476119 libinterp/corefcn/txt-eng-ft.h
--- a/libinterp/corefcn/txt-eng-ft.h	Mon Apr 21 17:17:15 2014 +0200
+++ b/libinterp/corefcn/txt-eng-ft.h	Wed May 07 08:39:56 2014 -0700
@@ -114,7 +114,7 @@
   ft_render& operator = (const ft_render&);
 
   // Class to hold information about fonts and a strong
-  // reference to the font objects loaded by freetype.
+  // reference to the font objects loaded by FreeType.
   class ft_font
   {
   public: