Index: src/cff/cffpic.c |
diff --git a/src/cff/cffpic.c b/src/cff/cffpic.c |
index 1c19d58bcbf6d271e150158016d52598f5eafc45..f22e4f0d537e795f6603583b4f4deb353cfe5c13 100644 |
--- a/src/cff/cffpic.c |
+++ b/src/cff/cffpic.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for cff module. */ |
/* */ |
-/* Copyright 2009, 2010 by */ |
+/* Copyright 2009, 2010, 2012, 2013 by */ |
/* Oran Agra and Mickey Gabel. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -23,65 +23,51 @@ |
#include "cffpic.h" |
#include "cfferrs.h" |
+ |
#ifdef FT_CONFIG_OPTION_PIC |
/* forward declaration of PIC init functions from cffdrivr.c */ |
FT_Error |
- FT_Create_Class_cff_services( |
- FT_Library library, |
- FT_ServiceDescRec** output_class ); |
- |
+ FT_Create_Class_cff_services( FT_Library library, |
+ FT_ServiceDescRec** output_class ); |
void |
- FT_Destroy_Class_cff_services( |
- FT_Library library, |
- FT_ServiceDescRec* clazz ); |
- |
+ FT_Destroy_Class_cff_services( FT_Library library, |
+ FT_ServiceDescRec* clazz ); |
void |
- FT_Init_Class_cff_service_ps_info( |
- FT_Library library, |
- FT_Service_PsInfoRec* clazz ); |
- |
+ FT_Init_Class_cff_service_ps_info( FT_Library library, |
+ FT_Service_PsInfoRec* clazz ); |
void |
- FT_Init_Class_cff_service_glyph_dict( |
- FT_Library library, |
- FT_Service_GlyphDictRec* clazz ); |
- |
+ FT_Init_Class_cff_service_glyph_dict( FT_Library library, |
+ FT_Service_GlyphDictRec* clazz ); |
void |
- FT_Init_Class_cff_service_ps_name( |
- FT_Library library, |
- FT_Service_PsFontNameRec* clazz ); |
- |
+ FT_Init_Class_cff_service_ps_name( FT_Library library, |
+ FT_Service_PsFontNameRec* clazz ); |
void |
- FT_Init_Class_cff_service_get_cmap_info( |
- FT_Library library, |
- FT_Service_TTCMapsRec* clazz ); |
- |
+ FT_Init_Class_cff_service_get_cmap_info( FT_Library library, |
+ FT_Service_TTCMapsRec* clazz ); |
void |
- FT_Init_Class_cff_service_cid_info( |
- FT_Library library, |
- FT_Service_CIDRec* clazz ); |
+ FT_Init_Class_cff_service_cid_info( FT_Library library, |
+ FT_Service_CIDRec* clazz ); |
/* forward declaration of PIC init functions from cffparse.c */ |
FT_Error |
- FT_Create_Class_cff_field_handlers( |
- FT_Library library, |
- CFF_Field_Handler** output_class ); |
- |
+ FT_Create_Class_cff_field_handlers( FT_Library library, |
+ CFF_Field_Handler** output_class ); |
void |
- FT_Destroy_Class_cff_field_handlers( |
- FT_Library library, |
- CFF_Field_Handler* clazz ); |
+ FT_Destroy_Class_cff_field_handlers( FT_Library library, |
+ CFF_Field_Handler* clazz ); |
+ |
void |
cff_driver_class_pic_free( FT_Library library ) |
{ |
FT_PIC_Container* pic_container = &library->pic_container; |
- FT_Memory memory = library->memory; |
+ FT_Memory memory = library->memory; |
if ( pic_container->cff ) |
{ |
- CffModulePIC* container = ( CffModulePIC* )pic_container->cff; |
+ CffModulePIC* container = (CffModulePIC*)pic_container->cff; |
if ( container->cff_services ) |
@@ -102,8 +88,8 @@ |
cff_driver_class_pic_init( FT_Library library ) |
{ |
FT_PIC_Container* pic_container = &library->pic_container; |
- FT_Error error = CFF_Err_Ok; |
- CffModulePIC* container; |
+ FT_Error error = FT_Err_Ok; |
+ CffModulePIC* container = NULL; |
FT_Memory memory = library->memory; |
@@ -113,15 +99,18 @@ |
FT_MEM_SET( container, 0, sizeof ( *container ) ); |
pic_container->cff = container; |
- /* initialize pointer table - this is how the module usually expects this data */ |
+ /* initialize pointer table - */ |
+ /* this is how the module usually expects this data */ |
error = FT_Create_Class_cff_services( library, |
&container->cff_services ); |
if ( error ) |
goto Exit; |
+ |
error = FT_Create_Class_cff_field_handlers( |
library, &container->cff_field_handlers ); |
if ( error ) |
goto Exit; |
+ |
FT_Init_Class_cff_service_ps_info( |
library, &container->cff_service_ps_info ); |
FT_Init_Class_cff_service_glyph_dict( |
@@ -136,7 +125,8 @@ |
library, &container->cff_cmap_encoding_class_rec ); |
FT_Init_Class_cff_cmap_unicode_class_rec( |
library, &container->cff_cmap_unicode_class_rec ); |
-Exit: |
+ |
+ Exit: |
if ( error ) |
cff_driver_class_pic_free( library ); |
return error; |