Index: src/truetype/ttpic.c |
diff --git a/src/truetype/ttpic.c b/src/truetype/ttpic.c |
index 65ca845aaf71fd012baf25bfc1d6353af43ec63a..edefae72c5c319277cc054fbe4a5f90c7a17ecfb 100644 |
--- a/src/truetype/ttpic.c |
+++ b/src/truetype/ttpic.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for truetype 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, */ |
@@ -22,30 +22,29 @@ |
#include "ttpic.h" |
#include "tterrors.h" |
+ |
#ifdef FT_CONFIG_OPTION_PIC |
/* forward declaration of PIC init functions from ttdriver.c */ |
FT_Error |
FT_Create_Class_tt_services( FT_Library library, |
FT_ServiceDescRec** output_class ); |
- |
void |
FT_Destroy_Class_tt_services( FT_Library library, |
FT_ServiceDescRec* clazz ); |
- |
void |
FT_Init_Class_tt_service_gx_multi_masters( |
FT_Service_MultiMastersRec* sv_mm ); |
- |
void |
FT_Init_Class_tt_service_truetype_glyf( |
FT_Service_TTGlyfRec* sv_ttglyf ); |
+ |
void |
tt_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->truetype ) |
@@ -66,18 +65,19 @@ |
tt_driver_class_pic_init( FT_Library library ) |
{ |
FT_PIC_Container* pic_container = &library->pic_container; |
- FT_Error error = TT_Err_Ok; |
- TTModulePIC* container; |
+ FT_Error error = FT_Err_Ok; |
+ TTModulePIC* container = NULL; |
FT_Memory memory = library->memory; |
/* allocate pointer, clear and set global container pointer */ |
- if ( FT_ALLOC ( container, sizeof ( *container ) ) ) |
+ if ( FT_ALLOC( container, sizeof ( *container ) ) ) |
return error; |
FT_MEM_SET( container, 0, sizeof ( *container ) ); |
pic_container->truetype = 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_tt_services( library, |
&container->tt_services ); |
if ( error ) |
@@ -88,7 +88,8 @@ |
#endif |
FT_Init_Class_tt_service_truetype_glyf( |
&container->tt_service_truetype_glyf ); |
-Exit: |
+ |
+ Exit: |
if ( error ) |
tt_driver_class_pic_free( library ); |
return error; |