Update to freetype-doc-2.6.5

lib/freetype/docs/design/design-5.html

@@ -352,7 +352,7 @@
         of the module to call "get_interface()" each time they need to
         access one of the object's common entry points.</p>
 
-        <p>Note that is is optional, and can be set to NULL.  Other
+        <p>Note that it is optional, and can be set to NULL.  Other
         interfaces can also be accessed through the <tt>get_interface()</tt>
         field.</p>
       </td>

lib/freetype/docs/documentation.html

@@ -87,6 +87,14 @@
           <h3><a href="design/index.html">The Design of
               FreeType</a></h3>
 
+          <h3><a href="text-rendering-general.html">On Slight Hinting,
+              Proper Text Rendering, Stem Darkening and LCD
+              Filters</a></h3>
+          <p>Originally written for the 2.6.2 release, contains
+            background information on several details of text
+            rendering.  Useful for better understanding the ‘big
+            picture’.</p>
+
           <h3><a href="rasterinfo/rasterinfo.html">The RasterInfo
               Font</a></h3>
         </div>
@@ -95,7 +103,7 @@
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 05-Oct-2015</p>
+          <p>Last update: 11-Feb-2016</p>
         </div>
       </div>
     </div>

lib/freetype/docs/glyphs/glyphs-3.html

@@ -90,7 +90,7 @@
 		  baseline.</em></p>
 
               <p align="center">
-		<img src="Image1.png"
+		<img src="layout.png"
 		     height="179"
 		     width="458"
 		     alt="horizontal layout">
@@ -101,7 +101,7 @@
 		the baseline:</p>
 
               <p align="center">
-		<img src="Image2.png"
+		<img src="layout2.png"
 		     height="275"
 		     width="162"
 		     alt="vertical layout">
@@ -290,7 +290,7 @@
 	  <p>Here is a picture giving all the details for horizontal metrics:
 
 	  <p align="center">
-	    <img src="Image3.png"
+	    <img src="metrics.png"
 		 height="253"
 		 width="388"
 		 alt="horizontal glyph metrics">
@@ -299,7 +299,7 @@
 	  <p>And here is another one for the vertical metrics:</p>
 
 	  <p align="center">
-	    <img src="Image4.png"
+	    <img src="metrics2.png"
 		 height="278"
 		 width="294"
 		 alt="vertical glyph metrics">

lib/freetype/docs/tutorial/example3.cpp

@@ -1,19 +1,17 @@
 // example3.cpp
 
-// This file demonstrates how to use FreeType's stand-alone renderer,
-// both in B/W and 5-levels gray mode.
+// This file demonstrates how to use FreeType's stand-alone B/W renderer.
 //
 // Copy the files ftraster.c, ftimage.h, and ftmisc.h into the same
 // directory as this file, then say
 //
-//   g++ -D_STANDALONE_ \
-//       -DFT_RASTER_OPTION_ANTI_ALIASING \
+//   g++ -D STANDALONE_ \
 //       -o example3 example3.cpp
 //
 // You need FreeType version 2.3.10 or newer.
 //
 // Written Sep. 2009 by Werner Lemberg,
-// based on code contributed by Erik Möller.
+// based on code contributed by Erik Möller.
 //
 // Public domain.
 
@@ -39,30 +37,30 @@ static Vec2 k_shape[] =
 };
 
 void*
-MY_Alloc_Func(FT_Memory memory,
+MY_Alloc_Func(FT_Memory /* memory */,
               long size)
 {
-  return malloc(size);
+  return malloc((size_t)size);
 }
 
 void
-MY_Free_Func(FT_Memory memory,
+MY_Free_Func(FT_Memory /* memory */,
              void *block)
 {
   free(block);
 }
 
 void*
-MY_Realloc_Func(FT_Memory memory,
-                long cur_size,
+MY_Realloc_Func(FT_Memory /* memory */,
+                long /* cur_size */,
                 long new_size,
                 void* block)
 {
-  return realloc(block, new_size);
+  return realloc(block, (size_t)new_size);
 }
 
 
-FT_Memory mem;
+static FT_Memory mem;
 
 
 // Render a shape and dump it out as out-mono.pbm (b/w) and
@@ -103,8 +101,6 @@ main()
 
   // 1 bit per pixel.
   const int pitch_mono = (width + 7) >> 3;
-  // 8 bits per pixel; must be a multiple of four.
-  const int pitch_gray = (width + 3) & -4;
 
 
   FT_Bitmap bmp;
@@ -140,35 +136,6 @@ main()
   out_mono << "P4 " << width << " " << rows << "\n";
   out_mono.write((const char *)bmp.buffer, rows * pitch_mono);
 
-  delete[] bmp.buffer;
-
-
-  // Set up a pixmap.
-  bmp.buffer = new unsigned char[rows * pitch_gray];
-  memset(bmp.buffer, 0, rows * pitch_gray);
-  bmp.width = width;
-  bmp.rows = rows;
-  bmp.pitch = pitch_gray;
-  bmp.pixel_mode = FT_PIXEL_MODE_GRAY;
-  bmp.num_grays = 16;
-
-  // Set up the necessary raster parameters.
-  memset(&params, 0, sizeof (params));
-  params.source = &outline;
-  params.target = &bmp;
-  params.flags = FT_RASTER_FLAG_AA;
-
-  // Initialize the rasterer and get it to render into the pixmap.
-  ft_standard_raster.raster_new(mem, &raster);
-  ft_standard_raster.raster_reset(raster, renderPool, kRenderPoolSize);
-  ft_standard_raster.raster_render(raster, &params);
-
-  // Dump out the raw image data (in PBM format).
-  std::ofstream out_gray("out-gray.pgm", std::ios::binary);
-  out_gray << "P5 " << width << " " << rows << " 255\n";
-  out_gray.write((const char *)bmp.buffer, rows * pitch_gray);
-
-
   // Cleanup.
   delete[] renderPool;
   delete[] bmp.buffer;

lib/freetype/docs/tutorial/step3.html

@@ -71,9 +71,9 @@
             found <a href="example2.cpp">here</a>.</p>
 
           <p><a href="example3.cpp">Another example</a> demonstrates
-            how to use FreeType's stand-alone rasterizer,
-            <tt>ftraster.c</tt>, both in B/W and 5-levels gray mode.
-            You need files from FreeType version 2.3.10 or newer.</p>
+            how to use FreeType's stand-alone B/W rasterizer,
+            <tt>ftraster.c</tt>.  You need files from FreeType version
+            2.3.10 or newer.</p>
 
           <p><a href="mailto:gsmiko@gmail.com">Róbert Márki</a>
             contributed a small
@@ -87,7 +87,7 @@
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 13-Dec-2014</p>
+          <p>Last update: 23-Mar-2016</p>
         </div>
       </div>
     </div>