| Index: src/pshinter/pshpic.c
|
| diff --git a/src/pshinter/pshpic.c b/src/pshinter/pshpic.c
|
| index 1e0f9a9dcffcc39ca26d4af7343a9437da44cbcb..568f4ac4b013629ee32d250c6a9b55be48e740bf 100644
|
| --- a/src/pshinter/pshpic.c
|
| +++ b/src/pshinter/pshpic.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* The FreeType position independent code services for pshinter 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,6 +22,7 @@
|
| #include "pshpic.h"
|
| #include "pshnterr.h"
|
|
|
| +
|
| #ifdef FT_CONFIG_OPTION_PIC
|
|
|
| /* forward declaration of PIC init functions from pshmod.c */
|
| @@ -33,7 +34,7 @@
|
| pshinter_module_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->pshinter )
|
| @@ -48,13 +49,13 @@
|
| pshinter_module_class_pic_init( FT_Library library )
|
| {
|
| FT_PIC_Container* pic_container = &library->pic_container;
|
| - FT_Error error = PSH_Err_Ok;
|
| - PSHinterPIC* container;
|
| + FT_Error error = FT_Err_Ok;
|
| + PSHinterPIC* 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->pshinter = container;
|
| @@ -63,13 +64,13 @@
|
| FT_Init_Class_pshinter_interface(
|
| library, &container->pshinter_interface );
|
|
|
| -/*Exit:*/
|
| - if( error )
|
| + if ( error )
|
| pshinter_module_class_pic_free( library );
|
| +
|
| return error;
|
| }
|
|
|
| -
|
| #endif /* FT_CONFIG_OPTION_PIC */
|
|
|
| +
|
| /* END */
|
|
|