[freetype2] master 500bcbd: Duplicates.

[Alexei Podtelezhnikov]

branch: master
commit 500bcbdded6b4996a07acd315d6c5bdd56615264
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    Duplicates.
---
 ChangeLog                   |    2 +-
 ChangeLog.24                |    2 +-
 include/freetype/freetype.h |    2 +-
 include/freetype/ftcache.h  |    8 ++++----
 include/freetype/ftimage.h  |    2 +-
 include/freetype/ftsystem.h |    2 +-
 src/gzip/zlib.h             |    2 +-
 src/pshinter/pshglob.c      |    2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cc48b3..58fd711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1196,7 +1196,7 @@
        [base] Check error when seeking to data supplied offset (#46635).
 
        * src/base/ftobjs.c (open_face_PS_from_sfnt_stream):
-       `ft_lookup_PS_in_sfnt_stream' returns offset and and length from
+       `ft_lookup_PS_in_sfnt_stream' returns offset and length from
        user supplied data.  Use of this these values must be checked.
 
 2015-12-13  Werner Lemberg  <address@hidden>
diff --git a/ChangeLog.24 b/ChangeLog.24
index a1f1576..e2b109c 100644
--- a/ChangeLog.24
+++ b/ChangeLog.24
@@ -1859,7 +1859,7 @@
 
        Fix `checking if gcc static flag -static works' test.
 
-       On my linux build tree, I receive yes answer in in every package I
+       On my linux build tree, I receive yes answer in every package I
        build except freetype for this test checking if gcc static flag
        `-static' works
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index b1dce99..bdcaf67 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1941,7 +1941,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    If the @FT_OPEN_MEMORY bit is set, assume that this is a           */
   /*    memory file of `memory_size' bytes, located at `memory_address'.   */
-  /*    The data are are not copied, and the client is responsible for     */
+  /*    The data are not copied, and the client is responsible for         */
   /*    releasing and destroying them _after_ the corresponding call to    */
   /*    @FT_Done_Face.                                                     */
   /*                                                                       */
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 6c9f2c4..883c88d 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -749,7 +749,7 @@ FT_BEGIN_HEADER
   /*    aglyph :: The corresponding @FT_Glyph object.  0~in case of        */
   /*              failure.                                                 */
   /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
+  /*    anode  :: Used to return the address of the corresponding cache    */
   /*              node after incrementing its reference count (see note    */
   /*              below).                                                  */
   /*                                                                       */
@@ -802,7 +802,7 @@ FT_BEGIN_HEADER
   /*    aglyph     :: The corresponding @FT_Glyph object.  0~in case of    */
   /*                  failure.                                             */
   /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
+  /*    anode      :: Used to return the address of the corresponding      */
   /*                  cache node after incrementing its reference count    */
   /*                  (see note below).                                    */
   /*                                                                       */
@@ -957,7 +957,7 @@ FT_BEGIN_HEADER
   /* <Output>                                                              */
   /*    sbit   :: A handle to a small bitmap descriptor.                   */
   /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
+  /*    anode  :: Used to return the address of the corresponding cache    */
   /*              node after incrementing its reference count (see note    */
   /*              below).                                                  */
   /*                                                                       */
@@ -1012,7 +1012,7 @@ FT_BEGIN_HEADER
   /* <Output>                                                              */
   /*    sbit       :: A handle to a small bitmap descriptor.               */
   /*                                                                       */
-  /*    anode      :: Used to return the address of of the corresponding   */
+  /*    anode      :: Used to return the address of the corresponding      */
   /*                  cache node after incrementing its reference count    */
   /*                  (see note below).                                    */
   /*                                                                       */
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 1d557c9..28b2704 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -747,7 +747,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* A raster is a scan converter, in charge of rendering an outline into  */
-  /* a a bitmap.  This section contains the public API for rasters.        */
+  /* a bitmap.  This section contains the public API for rasters.          */
   /*                                                                       */
   /* Note that in FreeType 2, all rasters are now encapsulated within      */
   /* specific modules called `renderers'.  See `ftrender.h' for more       */
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h
index 908ae07..a75f958 100644
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -290,7 +290,7 @@ FT_BEGIN_HEADER
    *     The stream size in bytes.
    *
    *     In case of compressed streams where the size is unknown before
-   *     actually doing the decompression, the value is set to 0x7FFFFFFF. 
+   *     actually doing the decompression, the value is set to 0x7FFFFFFF.
    *     (Note that this size value can occur for normal streams also; it is
    *     thus just a hint.)
    *
diff --git a/src/gzip/zlib.h b/src/gzip/zlib.h
index 50d0d3f..d361ff4 100644
--- a/src/gzip/zlib.h
+++ b/src/gzip/zlib.h
@@ -560,7 +560,7 @@ ZEXTERN(int)  inflateInit2 OF((z_streamp strm,
     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
   if no more input was provided, Z_DATA_ERROR if no flush point has been found,
   or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
+  case, the application may save the current value of total_in which
   indicates where valid compressed data was found. In the error case, the
   application may repeatedly call inflateSync, providing more input each time,
   until success or end of the input data.
diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c
index be71fc5..2ac5ef1 100644
--- a/src/pshinter/pshglob.c
+++ b/src/pshinter/pshglob.c
@@ -80,7 +80,7 @@
 
 #if 0
 
-  /* org_width is is font units, result in device pixels, 26.6 format */
+  /* org_width is in font units, result in device pixels, 26.6 format */
   FT_LOCAL_DEF( FT_Pos )
   psh_dimension_snap_width( PSH_Dimension  dimension,
                             FT_Int         org_width )