9b049849bf
Backported several patches from upstream. The test suite patch for Fontconfig is no longer necessary.
69 lines
1.6 KiB
Diff
69 lines
1.6 KiB
Diff
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
|
|
index c726e5e..830cabe 100644
|
|
--- a/src/pcf/pcf.h
|
|
+++ b/src/pcf/pcf.h
|
|
@@ -163,6 +163,13 @@ FT_BEGIN_HEADER
|
|
} PCF_FaceRec, *PCF_Face;
|
|
|
|
|
|
+ typedef struct PCF_DriverRec_
|
|
+ {
|
|
+ FT_DriverRec root;
|
|
+
|
|
+ } PCF_DriverRec, *PCF_Driver;
|
|
+
|
|
+
|
|
/* macros for pcf font format */
|
|
|
|
#define LSBFirst 0
|
|
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
|
|
index 10d5c20..8f4a90d 100644
|
|
--- a/src/pcf/pcfdrivr.c
|
|
+++ b/src/pcf/pcfdrivr.c
|
|
@@ -691,22 +691,38 @@ THE SOFTWARE.
|
|
}
|
|
|
|
|
|
+ FT_CALLBACK_DEF( FT_Error )
|
|
+ pcf_driver_init( FT_Module module ) /* PCF_Driver */
|
|
+ {
|
|
+ FT_UNUSED( module );
|
|
+
|
|
+ return FT_Err_Ok;
|
|
+ }
|
|
+
|
|
+
|
|
+ FT_CALLBACK_DEF( void )
|
|
+ pcf_driver_done( FT_Module module ) /* PCF_Driver */
|
|
+ {
|
|
+ FT_UNUSED( module );
|
|
+ }
|
|
+
|
|
+
|
|
FT_CALLBACK_TABLE_DEF
|
|
const FT_Driver_ClassRec pcf_driver_class =
|
|
{
|
|
{
|
|
FT_MODULE_FONT_DRIVER |
|
|
FT_MODULE_DRIVER_NO_OUTLINES,
|
|
- sizeof ( FT_DriverRec ),
|
|
|
|
+ sizeof ( PCF_DriverRec ),
|
|
"pcf",
|
|
0x10000L,
|
|
0x20000L,
|
|
|
|
- NULL, /* module-specific interface */
|
|
+ NULL, /* module-specific interface */
|
|
|
|
- NULL, /* FT_Module_Constructor module_init */
|
|
- NULL, /* FT_Module_Destructor module_done */
|
|
+ pcf_driver_init, /* FT_Module_Constructor module_init */
|
|
+ pcf_driver_done, /* FT_Module_Destructor module_done */
|
|
pcf_driver_requester /* FT_Module_Requester get_interface */
|
|
},
|
|
|
|
--
|
|
cgit v1.0-41-gc330
|
|
|