From 131a06bf5d3193119cfb8c30f8b3cf808fb41d58 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 Mar 2013 17:14:25 +0100 Subject: [PATCH] uncrustified after pull request #2 --- ChangeLog.txt | 6 ++++++ contrib/hbcairo/context.c | 7 +++---- contrib/hbcairo/core.c | 2 +- contrib/hbcairo/pattern.c | 24 +++++++++++------------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 488a73c0a5..0b59b697d5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-18 17:13 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbcairo/context.c + * contrib/hbcairo/core.c + * contrib/hbcairo/pattern.c + ! uncrustified after pull request #2 + 2013-03-18 14:17 UTC+0100 Viktor Szakats (harbour syenar.net) * ChangeLog.txt ! fixes #1 (test issue) diff --git a/contrib/hbcairo/context.c b/contrib/hbcairo/context.c index ddf03842e9..bf5ab1adb8 100644 --- a/contrib/hbcairo/context.c +++ b/contrib/hbcairo/context.c @@ -150,7 +150,6 @@ HB_FUNC( CAIRO_GET_DASH ) } - HB_FUNC( CAIRO_GET_LINE_WIDTH ) { cairo_t * pCairo = hb_cairo_param( 1 ); @@ -391,7 +390,7 @@ HB_FUNC( CAIRO_PUSH_GROUP ) { cairo_t * pCairo = hb_cairo_param( 1 ); - if ( pCairo ) + if( pCairo ) cairo_push_group( pCairo ); } @@ -400,7 +399,7 @@ HB_FUNC( CAIRO_POP_GROUP_TO_SOURCE ) { cairo_t * pCairo = hb_cairo_param( 1 ); - if ( pCairo ) + if( pCairo ) cairo_pop_group_to_source( pCairo ); } @@ -419,6 +418,6 @@ HB_FUNC( CAIRO_SET_SOURCE ) cairo_t * pCairo = hb_cairo_param( 1 ); cairo_pattern_t * pPattern = hb_cairo_pattern_param( 2 ); - if ( pCairo ) + if( pCairo ) cairo_set_source( pCairo, pPattern ); } diff --git a/contrib/hbcairo/core.c b/contrib/hbcairo/core.c index 9d87a969ae..a69b6dd5ae 100644 --- a/contrib/hbcairo/core.c +++ b/contrib/hbcairo/core.c @@ -396,7 +396,7 @@ HB_FUNC( CAIRO_PATH_ITERATOR_GET_POINTS ) HB_FUNC( CAIRO_PATH_ITERATOR_SET_POINTS ) { PHB_CAIRO_PATH_ITERATOR pIterator = ( PHB_CAIRO_PATH_ITERATOR ) hb_parptrGC( &s_gcIteratorFuncs, 1 ); - PHB_ITEM pArray = hb_param( 2, HB_IT_ARRAY ); + PHB_ITEM pArray = hb_param( 2, HB_IT_ARRAY ); cairo_path_t * pPath; if( pIterator && pIterator->ppPath && ( pPath = *( pIterator->ppPath ) ) != NULL && pArray ) diff --git a/contrib/hbcairo/pattern.c b/contrib/hbcairo/pattern.c index d8412b15a2..274cdc43e2 100644 --- a/contrib/hbcairo/pattern.c +++ b/contrib/hbcairo/pattern.c @@ -75,6 +75,7 @@ static const HB_GC_FUNCS s_gcPatternFuncs = cairo_pattern_t * hb_cairoPatternItemGet( PHB_ITEM pItem ) { cairo_pattern_t ** ppPattern = ( cairo_pattern_t ** ) hb_itemGetPtrGC( pItem, &s_gcPatternFuncs ); + return ppPattern ? *ppPattern : NULL; } @@ -124,7 +125,7 @@ HB_FUNC( CAIRO_PATTERN_ADD_COLOR_STOP_RGB ) { cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) cairo_pattern_add_color_stop_rgb( pPattern, hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); } @@ -133,7 +134,7 @@ HB_FUNC( CAIRO_PATTERN_ADD_COLOR_STOP_RGBA ) { cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) cairo_pattern_add_color_stop_rgba( pPattern, hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); } @@ -143,7 +144,7 @@ HB_FUNC( CAIRO_PATTERN_GET_COLOR_STOP_COUNT ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { int iCount; @@ -164,7 +165,7 @@ HB_FUNC( CAIRO_PATTERN_GET_COLOR_STOP_RGBA ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { double dOffset; double dRed; @@ -206,7 +207,7 @@ HB_FUNC( CAIRO_PATTERN_GET_RGBA ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { double dRed; double dGreen; @@ -240,9 +241,9 @@ HB_FUNC( CAIRO_PATTERN_GET_SURFACE ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { - cairo_surface_t *pSurface; + cairo_surface_t * pSurface; hb_retni( cairo_pattern_get_surface( pPattern, &pSurface ) ); @@ -268,7 +269,7 @@ HB_FUNC( CAIRO_PATTERN_GET_LINEAR_POINTS ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { double dX0; double dY0; @@ -302,7 +303,7 @@ HB_FUNC( CAIRO_PATTERN_GET_RADIAL_CIRCLES ) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE( 1, 4, 0 ) cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) + if( pPattern ) { double dX0; double dY0; @@ -333,11 +334,8 @@ HB_FUNC( CAIRO_PATTERN_STATUS ) { cairo_pattern_t * pPattern = hb_cairo_pattern_param( 1 ); - if ( pPattern ) - { + if( pPattern ) hb_retni( cairo_pattern_status( pPattern ) ); - } else hb_retni( -1 ); } -