diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 85ba36bc7b..fe65e94122 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-13 19:02 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbfimage/fi_wrp.c + * contrib/hbgd/gdwrp.c + * forgot to uncrustify + 2012-11-13 19:00 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbfimage/fi_wrp.c * contrib/hbfimage/tests/fitest.prg diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index 981d3f5c6e..ba7deb19bb 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -103,14 +103,14 @@ static HB_TSD_NEW( s_fi_error, typedef struct { FIBITMAP * dib; - HB_BOOL fFree; + HB_BOOL fFree; } HB_FIBITMAP, * PHB_FIBITMAP; static PHB_FIBITMAP PHB_FIBITMAP_create( FIBITMAP * dib, HB_BOOL fFree ) { PHB_FIBITMAP hb_dib = ( PHB_FIBITMAP ) hb_xgrab( sizeof( HB_FIBITMAP ) ); - hb_dib->dib = dib; + hb_dib->dib = dib; hb_dib->fFree = fFree; return hb_dib; @@ -182,10 +182,8 @@ static HB_GARBAGE_FUNC( hb_FIMULTIBITMAP_Destructor ) /* Check if pointer is not NULL to avoid multiple freeing */ if( *ptr ) - { /* set pointer to NULL to avoid multiple freeing */ *ptr = NULL; - } } static const HB_GC_FUNCS s_gcFIMULTIBITMAPFuncs = diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index dfe2d9e5c9..0b8745c1fc 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -133,6 +133,7 @@ static void hb_retGdImage( gdImagePtr im ) { gdImagePtr * ptr = ( gdImagePtr * ) hb_gcAllocate( sizeof( gdImagePtr ), &s_gcGDimageFuncs ); + *ptr = im; hb_retptrGC( ( void * ) ptr ); @@ -144,6 +145,7 @@ static PHB_ITEM hb_gdImageItemNew( gdImagePtr im ) { gdImagePtr * ptr = ( gdImagePtr * ) hb_gcAllocate( sizeof( gdImagePtr ), &s_gcGDimageFuncs ); + *ptr = im; return hb_itemPutPtrGC( NULL, ( void * ) ptr ); @@ -197,6 +199,7 @@ static void hb_retGdFont( gdFontPtr font ) { gdFontPtr * ptr = ( gdFontPtr * ) hb_gcAllocate( sizeof( gdFontPtr ), &s_gcGDfontFuncs ); + *ptr = font; hb_retptrGC( ( void * ) ptr ); @@ -208,6 +211,7 @@ static PHB_ITEM hb_gdFontItemNew( gdFontPtr font ) { gdFontPtr * ptr = ( gdFontPtr * ) hb_gcAllocate( sizeof( gdFontPtr ), &s_gcGDfontFuncs ); + *ptr = font; return hb_itemPutPtrGC( NULL, ( void * ) ptr );