Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8609
Modified Files:
freetype219.info freetype219.patch
Log Message:
Leopard fix reapplied
Index: freetype219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- freetype219.info 15 Nov 2006 04:00:23 -0000 1.10
+++ freetype219.info 3 Dec 2006 06:46:14 -0000 1.11
@@ -1,6 +1,6 @@
Package: freetype219
Version: 2.2.1
-Revision: 2
+Revision: 3
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype219-hinting
Replaces: freetype219-hinting
Index: freetype219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freetype219.patch 14 Nov 2006 23:48:55 -0000 1.6
+++ freetype219.patch 3 Dec 2006 06:46:14 -0000 1.7
@@ -1,6 +1,6 @@
-diff -uNr freetype-2.2.1/include/freetype/config/ftoption.h
freetype-2.2.1-new/include/freetype/config/ftoption.h
---- freetype-2.2.1/include/freetype/config/ftoption.h 2006-05-11
14:05:49.000000000 -0400
-+++ freetype-2.2.1-new/include/freetype/config/ftoption.h 2006-11-09
17:36:43.000000000 -0500
+diff -ruN freetype-2.2.1-orig/include/freetype/config/ftoption.h
freetype-2.2.1/include/freetype/config/ftoption.h
+--- freetype-2.2.1-orig/include/freetype/config/ftoption.h 2006-12-02
22:33:25.000000000 -0800
++++ freetype-2.2.1/include/freetype/config/ftoption.h 2006-12-02
22:33:51.000000000 -0800
@@ -448,7 +448,7 @@
/* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */
/* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */
@@ -10,9 +10,9 @@
/*************************************************************************/
-diff -uNr freetype-2.2.1/include/freetype/freetype.h
freetype-2.2.1-new/include/freetype/freetype.h
---- freetype-2.2.1/include/freetype/freetype.h 2006-05-12 09:52:24.000000000
-0400
-+++ freetype-2.2.1-new/include/freetype/freetype.h 2006-11-09
17:30:21.000000000 -0500
+diff -ruN freetype-2.2.1-orig/include/freetype/freetype.h
freetype-2.2.1/include/freetype/freetype.h
+--- freetype-2.2.1-orig/include/freetype/freetype.h 2006-12-02
22:33:25.000000000 -0800
++++ freetype-2.2.1/include/freetype/freetype.h 2006-12-02 22:33:51.000000000
-0800
@@ -17,11 +17,7 @@
@@ -26,9 +26,9 @@
#endif
-diff -uNr freetype-2.2.1/src/base/ftapi.c freetype-2.2.1-new/src/base/ftapi.c
---- freetype-2.2.1/src/base/ftapi.c 2002-03-30 08:16:33.000000000 -0500
-+++ freetype-2.2.1-new/src/base/ftapi.c 2006-11-09 17:30:21.000000000
-0500
+diff -ruN freetype-2.2.1-orig/src/base/ftapi.c freetype-2.2.1/src/base/ftapi.c
+--- freetype-2.2.1-orig/src/base/ftapi.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/base/ftapi.c 2006-12-02 22:33:51.000000000 -0800
@@ -117,5 +117,17 @@
FT_Stream_ExitFrame( stream );
}
@@ -47,9 +47,9 @@
+ }
/* END */
-diff -uNr freetype-2.2.1/src/base/ftbase.c freetype-2.2.1-new/src/base/ftbase.c
---- freetype-2.2.1/src/base/ftbase.c 2004-02-25 07:58:54.000000000 -0500
-+++ freetype-2.2.1-new/src/base/ftbase.c 2006-11-09 17:30:21.000000000
-0500
+diff -ruN freetype-2.2.1-orig/src/base/ftbase.c
freetype-2.2.1/src/base/ftbase.c
+--- freetype-2.2.1-orig/src/base/ftbase.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/base/ftbase.c 2006-12-02 22:33:51.000000000 -0800
@@ -30,6 +30,7 @@
#include "ftobjs.c"
#include "ftnames.c"
@@ -58,102 +58,9 @@
#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
#include "ftmac.c"
-diff -uNr freetype-2.2.1/src/bdf/bdflib.c freetype-2.2.1-new/src/bdf/bdflib.c
---- freetype-2.2.1/src/bdf/bdflib.c 2006-03-26 01:34:41.000000000 -0500
-+++ freetype-2.2.1-new/src/bdf/bdflib.c 2006-11-09 17:30:21.000000000
-0500
-@@ -1570,6 +1570,14 @@
- goto Exit;
- }
-
-+ /* Check that the encoding is in the range [0, 65535] because */
-+ /* otherwise p->have (a bitmap with static size) overflows. */
-+ if ( p->glyph_enc >= sizeof(p->have) * 8 )
-+ {
-+ error = BDF_Err_Invalid_File_Format; /* Not the ideal error code */
-+ goto Exit;
-+ }
-+
- /* Check to see whether this encoding has already been encountered. */
- /* If it has then change it to unencoded so it gets added if */
- /* indicated. */
-diff -uNr freetype-2.2.1/src/pcf/pcfread.c freetype-2.2.1-new/src/pcf/pcfread.c
---- freetype-2.2.1/src/pcf/pcfread.c 2006-01-23 11:35:18.000000000 -0500
-+++ freetype-2.2.1-new/src/pcf/pcfread.c 2006-11-09 17:32:22.000000000
-0500
-@@ -439,6 +439,14 @@
-
- for ( i = 0; i < nprops; i++ )
- {
-+ /* 2006:0500 (mbarnes) - Detect invalid string length.
-+ * XXX Is this is best error code to return? */
-+ if ( props[i].name < 0 )
-+ {
-+ error = FT_Err_Invalid_File_Format;
-+ goto Bail;
-+ }
-+
- /* XXX: make atom */
- if ( FT_NEW_ARRAY( properties[i].name,
- ft_strlen( strings + props[i].name ) + 1 ) )
-@@ -451,6 +459,14 @@
-
- if ( props[i].isString )
- {
-+ /* 2006:0500 (mbarnes) - Detect invalid string length.
-+ * XXX Is this the best error code to return? */
-+ if ( props[i].value < 0 )
-+ {
-+ error = FT_Err_Invalid_File_Format;
-+ goto Bail;
-+ }
-+
- if ( FT_NEW_ARRAY( properties[i].value.atom,
- ft_strlen( strings + props[i].value ) + 1 ) )
- goto Bail;
-diff -uNr freetype-2.2.1/src/sfnt/ttmtx.c freetype-2.2.1-new/src/sfnt/ttmtx.c
---- freetype-2.2.1/src/sfnt/ttmtx.c 2006-03-20 08:34:23.000000000 -0500
-+++ freetype-2.2.1-new/src/sfnt/ttmtx.c 2006-11-09 17:30:21.000000000
-0500
-@@ -169,7 +169,7 @@
- }
-
- if ( FT_QNEW_ARRAY( *longs, num_longs ) ||
-- FT_QNEW_ARRAY( *shorts, num_shorts ) )
-+ (num_shorts > 0 && FT_QNEW_ARRAY( *shorts, num_shorts ) ) )
- goto Fail;
-
- if ( FT_FRAME_ENTER( table_len ) )
-diff -uNr freetype-2.2.1/src/truetype/ttgload.c
freetype-2.2.1-new/src/truetype/ttgload.c
---- freetype-2.2.1/src/truetype/ttgload.c 2006-02-14 15:44:56.000000000
-0500
-+++ freetype-2.2.1-new/src/truetype/ttgload.c 2006-11-09 17:35:53.000000000
-0500
-@@ -932,7 +932,7 @@
- {
- FT_Error error;
- FT_Outline* outline;
--
-+ int i;
-
- outline = &loader->gloader->base.outline;
-
-@@ -989,6 +989,12 @@
-
- tt_prepare_zone( &loader->zone, &loader->gloader->base,
- start_point, start_contour );
-+ /* Some points are likely touched during execution of
-+ * instructions on components. So let's untouch them.
-+ */
-+ for (i = 0; i < loader->zone.n_points; i++)
-+ loader->zone.tags[i] &= ~(FT_CURVE_TAG_TOUCH_X |
FT_CURVE_TAG_TOUCH_Y);
-+
- loader->zone.n_points += 4;
-
- return TT_Hint_Glyph( loader, 1 );
-Index: src/base/ftmac.c
-===================================================================
-RCS file: /sources/freetype/freetype2/src/base/ftmac.c,v
-retrieving revision 1.43
-retrieving revision 1.48
-diff -u -b -w -r1.43 -r1.48
---- freetype2/src/base/ftmac.c 2 May 2006 09:00:29 -0000 1.43
-+++ freetype2/src/base/ftmac.c 15 Oct 2006 07:15:28 -0000 1.48
+diff -ruN freetype-2.2.1-orig/src/base/ftmac.c freetype-2.2.1/src/base/ftmac.c
+--- freetype-2.2.1-orig/src/base/ftmac.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/base/ftmac.c 2006-12-02 22:33:51.000000000 -0800
@@ -53,6 +53,12 @@
- If there is a TrueType font (an `sfnt' resource), read it into memory,
wrap it into a memory stream, load the TrueType driver and delegate
@@ -319,3 +226,103 @@
}
+diff -ruN freetype-2.2.1-orig/src/base/ftrfork.c
freetype-2.2.1/src/base/ftrfork.c
+--- freetype-2.2.1-orig/src/base/ftrfork.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/base/ftrfork.c 2006-12-02 22:39:34.000000000 -0800
+@@ -440,7 +440,7 @@
+ return error;
+
+ FT_MEM_COPY( newpath, base_file_name, base_file_len );
+- FT_MEM_COPY( newpath + base_file_len, "/rsrc", 6 );
++ FT_MEM_COPY( newpath + base_file_len, "/..namedfork/rsrc", 18 );
+
+ *result_file_name = newpath;
+ *result_offset = 0;
+diff -ruN freetype-2.2.1-orig/src/bdf/bdflib.c freetype-2.2.1/src/bdf/bdflib.c
+--- freetype-2.2.1-orig/src/bdf/bdflib.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/bdf/bdflib.c 2006-12-02 22:33:51.000000000 -0800
+@@ -1570,6 +1570,14 @@
+ goto Exit;
+ }
+
++ /* Check that the encoding is in the range [0, 65535] because */
++ /* otherwise p->have (a bitmap with static size) overflows. */
++ if ( p->glyph_enc >= sizeof(p->have) * 8 )
++ {
++ error = BDF_Err_Invalid_File_Format; /* Not the ideal error code */
++ goto Exit;
++ }
++
+ /* Check to see whether this encoding has already been encountered. */
+ /* If it has then change it to unencoded so it gets added if */
+ /* indicated. */
+diff -ruN freetype-2.2.1-orig/src/pcf/pcfread.c
freetype-2.2.1/src/pcf/pcfread.c
+--- freetype-2.2.1-orig/src/pcf/pcfread.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/pcf/pcfread.c 2006-12-02 22:33:51.000000000 -0800
+@@ -439,6 +439,14 @@
+
+ for ( i = 0; i < nprops; i++ )
+ {
++ /* 2006:0500 (mbarnes) - Detect invalid string length.
++ * XXX Is this is best error code to return? */
++ if ( props[i].name < 0 )
++ {
++ error = FT_Err_Invalid_File_Format;
++ goto Bail;
++ }
++
+ /* XXX: make atom */
+ if ( FT_NEW_ARRAY( properties[i].name,
+ ft_strlen( strings + props[i].name ) + 1 ) )
+@@ -451,6 +459,14 @@
+
+ if ( props[i].isString )
+ {
++ /* 2006:0500 (mbarnes) - Detect invalid string length.
++ * XXX Is this the best error code to return? */
++ if ( props[i].value < 0 )
++ {
++ error = FT_Err_Invalid_File_Format;
++ goto Bail;
++ }
++
+ if ( FT_NEW_ARRAY( properties[i].value.atom,
+ ft_strlen( strings + props[i].value ) + 1 ) )
+ goto Bail;
+diff -ruN freetype-2.2.1-orig/src/sfnt/ttmtx.c freetype-2.2.1/src/sfnt/ttmtx.c
+--- freetype-2.2.1-orig/src/sfnt/ttmtx.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/sfnt/ttmtx.c 2006-12-02 22:33:51.000000000 -0800
+@@ -169,7 +169,7 @@
+ }
+
+ if ( FT_QNEW_ARRAY( *longs, num_longs ) ||
+- FT_QNEW_ARRAY( *shorts, num_shorts ) )
++ (num_shorts > 0 && FT_QNEW_ARRAY( *shorts, num_shorts ) ) )
+ goto Fail;
+
+ if ( FT_FRAME_ENTER( table_len ) )
+diff -ruN freetype-2.2.1-orig/src/truetype/ttgload.c
freetype-2.2.1/src/truetype/ttgload.c
+--- freetype-2.2.1-orig/src/truetype/ttgload.c 2006-12-02 22:33:25.000000000
-0800
++++ freetype-2.2.1/src/truetype/ttgload.c 2006-12-02 22:33:51.000000000
-0800
+@@ -932,7 +932,7 @@
+ {
+ FT_Error error;
+ FT_Outline* outline;
+-
++ int i;
+
+ outline = &loader->gloader->base.outline;
+
+@@ -989,6 +989,12 @@
+
+ tt_prepare_zone( &loader->zone, &loader->gloader->base,
+ start_point, start_contour );
++ /* Some points are likely touched during execution of
++ * instructions on components. So let's untouch them.
++ */
++ for (i = 0; i < loader->zone.n_points; i++)
++ loader->zone.tags[i] &= ~(FT_CURVE_TAG_TOUCH_X |
FT_CURVE_TAG_TOUCH_Y);
++
+ loader->zone.n_points += 4;
+
+ return TT_Hint_Glyph( loader, 1 );
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
