Sun Feb 10 01:12:35 PST 2013

2 files changed, 0 insertions, 131 deletions

diff --git a/extra/freetype2/bug35833.patch b/extra/freetype2/bug35833.patch
deleted file mode 100644
index 69ad25402..000000000
--- a/extra/freetype2/bug35833.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 9a55cb7a71286154cb62e947ed1c183450a8004d Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Wed, 14 Mar 2012 13:40:03 +0000
-Subject: Fix Savannah bug #35833.
-
-Based on the patch given in the bug report.
-
-* src/type1/t1load.c (IS_INCREMENTAL): New macro.
-(read_binary_data): Add parameter `incremental'.
-Update all callers using `IS_INCREMENTAL'.
----
-diff --git a/src/type1/t1load.c b/src/type1/t1load.c
-index a0adfd4..4385417 100644
---- a/src/type1/t1load.c
-+++ b/src/type1/t1load.c
-@@ -71,6 +71,13 @@
- #include "t1errors.h"
- 
- 
-+#ifdef FT_CONFIG_OPTION_INCREMENTAL
-+#define IS_INCREMENTAL  ( face->root.internal->incremental_interface != 0 )
-+#else
-+#define IS_INCREMENTAL  0
-+#endif
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1030,7 +1037,8 @@
-   static int
-   read_binary_data( T1_Parser  parser,
-                     FT_Long*   size,
--                    FT_Byte**  base )
-+                    FT_Byte**  base,
-+                    FT_Bool    incremental )
-   {
-     FT_Byte*  cur;
-     FT_Byte*  limit = parser->root.limit;
-@@ -1065,8 +1073,12 @@
-       }
-     }
- 
--    FT_ERROR(( "read_binary_data: invalid size field\n" ));
--    parser->root.error = T1_Err_Invalid_File_Format;
-+    if( !incremental )
-+    {
-+      FT_ERROR(( "read_binary_data: invalid size field\n" ));
-+      parser->root.error = T1_Err_Invalid_File_Format;
-+    }
-+
-     return 0;
-   }
- 
-@@ -1396,7 +1408,7 @@
- 
-       idx = T1_ToInt( parser );
- 
--      if ( !read_binary_data( parser, &size, &base ) )
-+      if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-         return;
- 
-       /* The binary string is followed by one token, e.g. `NP' */
-@@ -1582,7 +1594,7 @@
-         cur++;                              /* skip `/' */
-         len = parser->root.cursor - cur;
- 
--        if ( !read_binary_data( parser, &size, &base ) )
-+        if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-           return;
- 
-         /* for some non-standard fonts like `Optima' which provides */
-@@ -1871,7 +1883,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -1884,7 +1896,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -2160,9 +2172,7 @@
-       type1->subrs_len   = loader.subrs.lengths;
-     }
- 
--#ifdef FT_CONFIG_OPTION_INCREMENTAL
--    if ( !face->root.internal->incremental_interface )
--#endif
-+    if ( !IS_INCREMENTAL )
-       if ( !loader.charstrings.init )
-       {
-         FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" ));
---
-cgit v0.9.0.2
diff --git a/extra/freetype2/bug35847.patch b/extra/freetype2/bug35847.patch
deleted file mode 100644
index 683cbc37e..000000000
--- a/extra/freetype2/bug35847.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b43e0f4413b2aafb88be8cb3fb7aaa84ac0b9102 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Sat, 17 Mar 2012 06:42:43 +0000
-Subject: [type1] Fix Savannah bug #35847.
-
-* src/type1/t1load.c (parse_subrs): Fix the loop exit condition;
-we want to exit when we have run out of data.
----
-diff --git a/src/type1/t1load.c b/src/type1/t1load.c
-index 4385417..5803fde 100644
---- a/src/type1/t1load.c
-+++ b/src/type1/t1load.c
-@@ -1399,9 +1399,10 @@
-       FT_Byte*  base;
- 
- 
--      /* If the next token isn't `dup' we are done. */
--      if ( parser->root.cursor + 4 < parser->root.limit            &&
--           ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-+      /* If we are out of data, or if the next token isn't `dup', */
-+      /* we are done.                                             */
-+      if ( parser->root.cursor + 4 >= parser->root.limit          ||
-+          ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-         break;
- 
-       T1_Skip_PS_Token( parser );       /* `dup' */
---
-cgit v0.9.0.2