From 5316185bd8db3b61d040663f32b586cd614879fe Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 9 Dec 2009 16:52:49 +0000 Subject: [PATCH] 2009-12-09 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbnf/dispc.c * contrib/hbfimage/fi_winfu.c * contrib/hbfimage/fi_wrp.c * contrib/hbgd/gdwrp.c * Changed to use HB_IS*() macros to check parameter types instead of using hb_parinfo() & HB_IT_*. * Formatting. (deleted unnecessary blocks, returns, spaces) --- harbour/ChangeLog | 9 + harbour/contrib/hbfimage/fi_winfu.c | 19 +- harbour/contrib/hbfimage/fi_wrp.c | 1458 +++++++++++---------------- harbour/contrib/hbgd/gdwrp.c | 721 ++++++------- harbour/contrib/hbnf/dispc.c | 2 +- 5 files changed, 916 insertions(+), 1293 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0c413f2052..3b0e4e5484 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-09 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbnf/dispc.c + * contrib/hbfimage/fi_winfu.c + * contrib/hbfimage/fi_wrp.c + * contrib/hbgd/gdwrp.c + * Changed to use HB_IS*() macros to check parameter types instead + of using hb_parinfo() & HB_IT_*. + * Formatting. (deleted unnecessary blocks, returns, spaces) + 2009-12-09 08:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.prg * contrib/hbxbp/xbpdataref.prg diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c index 2a21739c9d..9c2c823d93 100644 --- a/harbour/contrib/hbfimage/fi_winfu.c +++ b/harbour/contrib/hbfimage/fi_winfu.c @@ -75,7 +75,7 @@ HB_FUNC( FI_FITOBITMAP ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { FIBITMAP *dib; @@ -98,7 +98,6 @@ HB_FUNC( FI_FITOBITMAP ) } else { - /* Parameter error */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); @@ -115,7 +114,7 @@ HB_FUNC( FI_FITOBITMAP ) HB_FUNC( FI_BITMAPTOFI ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { FIBITMAP * dib; @@ -146,7 +145,6 @@ HB_FUNC( FI_BITMAPTOFI ) } else { - /* Parameter error */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); @@ -163,12 +161,12 @@ HB_FUNC( FI_BITMAPTOFI ) HB_FUNC( FI_WINDRAW ) { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { FIBITMAP * dib; @@ -200,7 +198,6 @@ HB_FUNC( FI_WINDRAW ) } else { - /* Parameter error */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index b38980ebec..af6c96ee3a 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -79,13 +79,13 @@ static void *pErrorHandler = NULL; /* DLL_API void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only FI_DEFAULT(FALSE)); */ HB_FUNC( FI_INITIALISE ) { - BOOL bLoadPluginsOnly; + BOOL bLoadPluginsOnly; - /* Retrieve parameters */ - bLoadPluginsOnly = ( hb_parinfo( 1 ) & HB_IT_LOGICAL ? hb_parl( 1 ) : FALSE ); + /* Retrieve parameters */ + bLoadPluginsOnly = ( HB_ISLOG( 1 ) ? hb_parl( 1 ) : FALSE ); - /* Run function */ - FreeImage_Initialise( bLoadPluginsOnly ); + /* Run function */ + FreeImage_Initialise( bLoadPluginsOnly ); } /* -------------------------------------------------------------------------- */ @@ -93,8 +93,8 @@ HB_FUNC( FI_INITIALISE ) /* DLL_API void DLL_CALLCONV FreeImage_DeInitialise(void); */ HB_FUNC( FI_DEINITIALISE ) { - /* Run function */ - FreeImage_DeInitialise(); + /* Run function */ + FreeImage_DeInitialise(); } /* -------------------------------------------------------------------------- */ @@ -104,8 +104,8 @@ HB_FUNC( FI_DEINITIALISE ) /* DLL_API const char *DLL_CALLCONV FreeImage_GetVersion(void); */ HB_FUNC( FI_GETVERSION ) { - /* Run function & return value */ - hb_retc( FreeImage_GetVersion() ); + /* Run function & return value */ + hb_retc( FreeImage_GetVersion() ); } /* -------------------------------------------------------------------------- */ @@ -113,8 +113,8 @@ HB_FUNC( FI_GETVERSION ) /* DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); */ HB_FUNC( FI_GETCOPYRIGHTMESSAGE ) { - /* Run function & return value */ - hb_retc( FreeImage_GetCopyrightMessage() ); + /* Run function & return value */ + hb_retc( FreeImage_GetCopyrightMessage() ); } /* -------------------------------------------------------------------------- */ @@ -135,7 +135,7 @@ FreeImage error handler */ void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) { - const char *format; + const char * format; PHB_SYMB pSymbol; if( ! pErrorHandler ) @@ -174,7 +174,7 @@ HB_FUNC( FI_SETOUTPUTMESSAGE ) if( hb_pcount() == 1 ) { - if( hb_parinfo( 1 ) & HB_IT_POINTER ) + if( HB_ISPOINTER( 1 ) ) { /* Set the pointer */ pErrorHandler = hb_parptr( 1 ); @@ -185,14 +185,10 @@ HB_FUNC( FI_SETOUTPUTMESSAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } } @@ -205,9 +201,9 @@ HB_FUNC( FI_SETOUTPUTMESSAGE ) HB_FUNC( FI_ALLOCATE ) { if( hb_pcount() >= 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { int width, height, bpp; @@ -217,23 +213,19 @@ HB_FUNC( FI_ALLOCATE ) width = hb_parni( 1 ); height = hb_parni( 2 ); bpp = hb_parni( 3 ); - red_mask = ( hb_parinfo( 4 ) & HB_IT_NUMERIC ? hb_parni( 4 ) : 0 ); - green_mask = ( hb_parinfo( 5 ) & HB_IT_NUMERIC ? hb_parni( 5 ) : 0 ); - blue_mask = ( hb_parinfo( 6 ) & HB_IT_NUMERIC ? hb_parni( 6 ) : 0 ); + red_mask = ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 0 ); + green_mask = ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 0 ); + blue_mask = ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 0 ); /* run function & return value */ hb_retptr( FreeImage_Allocate(width, height, bpp, red_mask, green_mask, blue_mask) ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) + ); } } @@ -243,9 +235,9 @@ HB_FUNC( FI_ALLOCATE ) HB_FUNC( FI_ALLOCATET ) { if( hb_pcount() >= 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { FREE_IMAGE_TYPE type; @@ -256,24 +248,20 @@ HB_FUNC( FI_ALLOCATET ) type = ( FREE_IMAGE_TYPE ) hb_parni( 1 ); width = hb_parni( 2 ); height = hb_parni( 3 ); - bpp = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : 8 ); - red_mask = ( hb_parinfo( 4 ) & HB_IT_NUMERIC ? hb_parni( 4 ) : 0 ); - green_mask = ( hb_parinfo( 5 ) & HB_IT_NUMERIC ? hb_parni( 5 ) : 0 ); - blue_mask = ( hb_parinfo( 6 ) & HB_IT_NUMERIC ? hb_parni( 6 ) : 0 ); + bpp = ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 8 ); + red_mask = ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 0 ); + green_mask = ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 0 ); + blue_mask = ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 0 ); /* run function & return value */ hb_retptr( FreeImage_AllocateT(type, width, height, bpp, red_mask, green_mask, blue_mask) ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) + ); } } @@ -283,11 +271,11 @@ HB_FUNC( FI_ALLOCATET ) HB_FUNC( FI_CLONE ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; - FIBITMAP *fiClonePtr; + FIBITMAP * dib; + FIBITMAP * fiClonePtr; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -301,13 +289,9 @@ HB_FUNC( FI_CLONE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -317,10 +301,10 @@ HB_FUNC( FI_CLONE ) HB_FUNC( FI_UNLOAD ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -332,13 +316,9 @@ HB_FUNC( FI_UNLOAD ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -352,12 +332,12 @@ HB_FUNC( FI_UNLOAD ) HB_FUNC( FI_LOADFROMMEM ) { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_STRING && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISCHAR( 2 ) && + HB_ISNUM( 3 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_FORMAT fif; FIMEMORY *stream; const char *szImage; @@ -379,13 +359,9 @@ HB_FUNC( FI_LOADFROMMEM ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -393,14 +369,14 @@ HB_FUNC( FI_LOADFROMMEM ) HB_FUNC( FI_LOAD ) { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_STRING && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISCHAR( 2 ) && + HB_ISNUM( 3 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_FORMAT fif; - const char *filename; + const char * filename; int flags; /* Retrieve parameters */ @@ -417,13 +393,9 @@ HB_FUNC( FI_LOAD ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -438,15 +410,15 @@ HB_FUNC( FI_LOAD ) HB_FUNC( FI_SAVE ) { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_STRING && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISCHAR( 3 ) && + HB_ISNUM( 4 ) ) { FREE_IMAGE_FORMAT fif; - FIBITMAP *dib; - const char *filename; + FIBITMAP * dib; + const char * filename; int flags; /* Retrieve parameters */ @@ -460,13 +432,9 @@ HB_FUNC( FI_SAVE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 4, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 4, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); } } @@ -523,27 +491,27 @@ DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif HB_FUNC( FI_OPENMULTIBITMAP ) { if( hb_pcount() >= 4 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_STRING && - hb_parinfo( 3 ) & HB_IT_LOGICAL && - hb_parinfo( 4 ) & HB_IT_LOGICAL + HB_ISNUM( 1 ) && + HB_ISCHAR( 2 ) && + HB_ISLOG( 3 ) && + HB_ISLOG( 4 ) ) { - FIMULTIBITMAP *dib; + FIMULTIBITMAP * dib; FREE_IMAGE_FORMAT fif; - const char *filename; + const char * filename; BOOL create_new; BOOL read_only; BOOL keep_cache_in_memory; int flags; /* Retrieve parameters */ - fif = ( FREE_IMAGE_FORMAT) hb_parni( 1 ); + fif = ( FREE_IMAGE_FORMAT ) hb_parni( 1 ); filename = hb_parcx( 2 ); create_new = hb_parl( 3 ); read_only = hb_parl( 4 ); - keep_cache_in_memory = ( hb_parinfo( 5 ) & HB_IT_LOGICAL ? hb_parl( 5 ) : FALSE ); - flags = ( hb_parinfo( 6 ) & HB_IT_NUMERIC ? hb_parni( 6 ) : 0 ); + keep_cache_in_memory = ( HB_ISLOG( 5 ) ? hb_parl( 5 ) : FALSE ); + flags = ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 0 ); /* run function */ dib = FreeImage_OpenMultiBitmap(fif, filename, create_new, read_only, keep_cache_in_memory, flags); @@ -554,13 +522,9 @@ HB_FUNC( FI_OPENMULTIBITMAP ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 4, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 4, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); } } @@ -570,28 +534,24 @@ HB_FUNC( FI_OPENMULTIBITMAP ) HB_FUNC( FI_CLOSEMULTIBITMAP ) { if( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; int flags; /* Retrieve parameters */ bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 ); - flags = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ? hb_parni( 2 ) : 0 ); + flags = ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ); /* run function & return value */ hb_retl( FreeImage_CloseMultiBitmap(bitmap, flags) ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -601,10 +561,10 @@ HB_FUNC( FI_CLOSEMULTIBITMAP ) HB_FUNC( FI_GETPAGECOUNT ) { if( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; /* Retrieve parameters */ bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 ); @@ -615,13 +575,9 @@ HB_FUNC( FI_GETPAGECOUNT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -631,11 +587,11 @@ HB_FUNC( FI_GETPAGECOUNT ) HB_FUNC( FI_APPENDPAGE ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; FIBITMAP *data; /* Retrieve parameters */ @@ -647,13 +603,9 @@ HB_FUNC( FI_APPENDPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -663,12 +615,12 @@ HB_FUNC( FI_APPENDPAGE ) HB_FUNC( FI_INSERTPAGE ) { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISPOINTER( 3 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; int page; FIBITMAP *data; @@ -682,13 +634,9 @@ HB_FUNC( FI_INSERTPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -698,11 +646,11 @@ HB_FUNC( FI_INSERTPAGE ) HB_FUNC( FI_DELETEPAGE ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; int page; /* Retrieve parameters */ @@ -714,13 +662,9 @@ HB_FUNC( FI_DELETEPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -730,11 +674,11 @@ HB_FUNC( FI_DELETEPAGE ) HB_FUNC( FI_LOCKPAGE ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; int page; /* Retrieve parameters */ @@ -746,13 +690,9 @@ HB_FUNC( FI_LOCKPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -762,12 +702,12 @@ HB_FUNC( FI_LOCKPAGE ) HB_FUNC( FI_UNLOCKPAGE ) { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_LOGICAL + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISLOG( 3 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; FIBITMAP *page; BOOL changed; @@ -782,13 +722,9 @@ HB_FUNC( FI_UNLOCKPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -798,12 +734,12 @@ HB_FUNC( FI_UNLOCKPAGE ) HB_FUNC( FI_MOVEPAGE ) { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { - FIMULTIBITMAP *bitmap; + FIMULTIBITMAP * bitmap; int target, source; /* Retrieve parameters */ @@ -817,13 +753,9 @@ HB_FUNC( FI_MOVEPAGE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -841,15 +773,15 @@ HB_FUNC( FI_MOVEPAGE ) HB_FUNC( FI_GETFILETYPE ) { if( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_STRING + HB_ISCHAR( 1 ) ) { - const char *filename; + const char * filename; int size; /* Retrieve parameters */ filename = hb_parcx( 1 ); - size = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ? hb_parni( 1 ) : 0 ); + size = ( HB_ISNUM( 2 ) ? hb_parni( 1 ) : 0 ); /* run function & return value */ hb_retni( FreeImage_GetFileType(filename, size) ); @@ -857,13 +789,9 @@ HB_FUNC( FI_GETFILETYPE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -875,7 +803,7 @@ HB_FUNC( FI_GETFILETYPE ) HB_FUNC( FI_GETFILETYPEFROMMEM ) { if( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_STRING + HB_ISCHAR( 1 ) ) { const char * szImage; @@ -885,7 +813,7 @@ HB_FUNC( FI_GETFILETYPEFROMMEM ) /* Retrieve parameters */ szImage = hb_parcx( 1 ); stream = FreeImage_OpenMemory( ( BYTE * ) szImage, hb_parclen( 1 ) ); - size = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ? hb_parni( 1 ) : 0 ); + size = ( HB_ISNUM( 2 ) ? hb_parni( 1 ) : 0 ); /* run function & return value */ hb_retni( FreeImage_GetFileTypeFromMemory(stream, size) ); @@ -894,13 +822,9 @@ HB_FUNC( FI_GETFILETYPEFROMMEM ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -912,10 +836,10 @@ HB_FUNC( FI_GETFILETYPEFROMMEM ) HB_FUNC( FI_GETIMAGETYPE ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -926,13 +850,9 @@ HB_FUNC( FI_GETIMAGETYPE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -961,10 +881,10 @@ HB_FUNC( FI_ISLITTLEENDIAN ) HB_FUNC( FI_GETBITS ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -974,13 +894,9 @@ HB_FUNC( FI_GETBITS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -990,11 +906,11 @@ HB_FUNC( FI_GETBITS ) HB_FUNC( FI_GETSCANLINE ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; int scanline; /* Retrieve parameters */ @@ -1006,13 +922,9 @@ HB_FUNC( FI_GETSCANLINE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1033,10 +945,10 @@ DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, uns HB_FUNC( FI_GETCOLORSUSED ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1047,13 +959,9 @@ HB_FUNC( FI_GETCOLORSUSED ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1063,10 +971,10 @@ HB_FUNC( FI_GETCOLORSUSED ) HB_FUNC( FI_GETBPP ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1077,13 +985,9 @@ HB_FUNC( FI_GETBPP ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1093,10 +997,10 @@ HB_FUNC( FI_GETBPP ) HB_FUNC( FI_GETWIDTH ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1107,13 +1011,9 @@ HB_FUNC( FI_GETWIDTH ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1123,10 +1023,10 @@ HB_FUNC( FI_GETWIDTH ) HB_FUNC( FI_GETHEIGHT ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1137,13 +1037,9 @@ HB_FUNC( FI_GETHEIGHT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1153,10 +1049,10 @@ HB_FUNC( FI_GETHEIGHT ) HB_FUNC( FI_GETLINE ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1167,13 +1063,9 @@ HB_FUNC( FI_GETLINE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1183,10 +1075,10 @@ HB_FUNC( FI_GETLINE ) HB_FUNC( FI_GETPITCH ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1197,13 +1089,9 @@ HB_FUNC( FI_GETPITCH ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1213,10 +1101,10 @@ HB_FUNC( FI_GETPITCH ) HB_FUNC( FI_GETDIBSIZE ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1227,13 +1115,9 @@ HB_FUNC( FI_GETDIBSIZE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1243,10 +1127,10 @@ HB_FUNC( FI_GETDIBSIZE ) HB_FUNC( FI_GETPALETTE ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1256,13 +1140,9 @@ HB_FUNC( FI_GETPALETTE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1272,10 +1152,10 @@ HB_FUNC( FI_GETPALETTE ) HB_FUNC( FI_GETDOTSPERMETERX ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1286,13 +1166,9 @@ HB_FUNC( FI_GETDOTSPERMETERX ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1302,10 +1178,10 @@ HB_FUNC( FI_GETDOTSPERMETERX ) HB_FUNC( FI_GETDOTSPERMETERY ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1316,13 +1192,9 @@ HB_FUNC( FI_GETDOTSPERMETERY ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1332,11 +1204,11 @@ HB_FUNC( FI_GETDOTSPERMETERY ) HB_FUNC( FI_SETDOTSPERMETERX ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; UINT res; /* Retrieve parameters */ @@ -1349,13 +1221,9 @@ HB_FUNC( FI_SETDOTSPERMETERX ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1365,11 +1233,11 @@ HB_FUNC( FI_SETDOTSPERMETERX ) HB_FUNC( FI_SETDOTSPERMETERY ) { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; UINT res; /* Retrieve parameters */ @@ -1382,13 +1250,9 @@ HB_FUNC( FI_SETDOTSPERMETERY ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1398,13 +1262,13 @@ HB_FUNC( FI_SETDOTSPERMETERY ) HB_FUNC( FI_GETINFOHEADER ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { - FIBITMAP *dib; + FIBITMAP * dib; /* We need not worry about Memory Management - will be automatically released! */ - /*BITMAPINFOHEADER *bmpinfoheader = (BITMAPINFOHEADER *) hb_xgrab( sizeof( BITMAPINFOHEADER ) );*/ - BITMAPINFOHEADER *bmpinfoheader; + /*BITMAPINFOHEADER * bmpinfoheader = (BITMAPINFOHEADER *) hb_xgrab( sizeof( BITMAPINFOHEADER ) );*/ + BITMAPINFOHEADER * bmpinfoheader; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1417,13 +1281,9 @@ HB_FUNC( FI_GETINFOHEADER ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1432,13 +1292,12 @@ HB_FUNC( FI_GETINFOHEADER ) /* DLL_API BITMAPINFO *DLL_CALLCONV FreeImage_GetInfo(FIBITMAP *dib); */ HB_FUNC( FI_GETINFO ) { - - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; - BITMAPINFO *bmpinfo; + FIBITMAP * dib; + BITMAPINFO * bmpinfo; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1450,13 +1309,9 @@ HB_FUNC( FI_GETINFO ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1465,11 +1320,11 @@ HB_FUNC( FI_GETINFO ) /* DLL_API FREE_IMAGE_COLOR_TYPE DLL_CALLCONV FreeImage_GetColorType(FIBITMAP *dib); */ HB_FUNC( FI_GETCOLORTYPE ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1480,13 +1335,9 @@ HB_FUNC( FI_GETCOLORTYPE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1495,11 +1346,11 @@ HB_FUNC( FI_GETCOLORTYPE ) /* DLL_API unsigned DLL_CALLCONV FreeImage_GetRedMask(FIBITMAP *dib); */ HB_FUNC( FI_GETREDMASK ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1510,13 +1361,9 @@ HB_FUNC( FI_GETREDMASK ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1525,11 +1372,11 @@ HB_FUNC( FI_GETREDMASK ) /* DLL_API unsigned DLL_CALLCONV FreeImage_GetGreenMask(FIBITMAP *dib); */ HB_FUNC( FI_GETGREENMASK ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1540,13 +1387,9 @@ HB_FUNC( FI_GETGREENMASK ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1555,11 +1398,11 @@ HB_FUNC( FI_GETGREENMASK ) /* DLL_API unsigned DLL_CALLCONV FreeImage_GetBlueMask(FIBITMAP *dib); */ HB_FUNC( FI_GETBLUEMASK ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1570,13 +1413,9 @@ HB_FUNC( FI_GETBLUEMASK ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1585,11 +1424,11 @@ HB_FUNC( FI_GETBLUEMASK ) /* DLL_API unsigned DLL_CALLCONV FreeImage_GetTransparencyCount(FIBITMAP *dib); */ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1600,13 +1439,9 @@ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1615,11 +1450,11 @@ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) /* DLL_API BYTE * DLL_CALLCONV FreeImage_GetTransparencyTable(FIBITMAP *dib); */ HB_FUNC( FI_GETTRANSPARENCYTABLE ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1629,13 +1464,9 @@ HB_FUNC( FI_GETTRANSPARENCYTABLE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1644,12 +1475,12 @@ HB_FUNC( FI_GETTRANSPARENCYTABLE ) /* DLL_API void DLL_CALLCONV FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled); */ HB_FUNC( FI_SETTRANSPARENT ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; BOOL enabled; /* Retrieve parameters */ @@ -1662,13 +1493,9 @@ HB_FUNC( FI_SETTRANSPARENT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1677,13 +1504,13 @@ HB_FUNC( FI_SETTRANSPARENT ) /* DLL_API void DLL_CALLCONV FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count); */ HB_FUNC( FI_SETTRANSPARENCYTABLE ) { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; BYTE *table; int count; @@ -1698,13 +1525,9 @@ HB_FUNC( FI_SETTRANSPARENCYTABLE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); } } @@ -1713,11 +1536,11 @@ HB_FUNC( FI_SETTRANSPARENCYTABLE ) /* DLL_API BOOL DLL_CALLCONV FreeImage_IsTransparent(FIBITMAP *dib); */ HB_FUNC( FI_ISTRANSPARENT ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1728,13 +1551,9 @@ HB_FUNC( FI_ISTRANSPARENT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1743,11 +1562,11 @@ HB_FUNC( FI_ISTRANSPARENT ) /* DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib); */ HB_FUNC( FI_HASBACKGROUNDCOLOR ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1758,13 +1577,9 @@ HB_FUNC( FI_HASBACKGROUNDCOLOR ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1773,13 +1588,12 @@ HB_FUNC( FI_HASBACKGROUNDCOLOR ) /* DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); */ HB_FUNC( FI_GETBACKGROUNDCOLOR ) { - - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER /*&& hb_parinfo( 2 ) & HB_IT_STRING*/ - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) /*&& HB_ISCHAR( 2 )*/ + ) { - FIBITMAP *dib; - RGBQUAD *bkcolor = NULL; + FIBITMAP * dib; + RGBQUAD * bkcolor = NULL; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1788,19 +1602,15 @@ HB_FUNC( FI_GETBACKGROUNDCOLOR ) /* run function & return value */ /*hb_retl( FreeImage_GetBackgroundColor(dib, bkcolor) );*/ - FreeImage_GetBackgroundColor(dib, bkcolor); + FreeImage_GetBackgroundColor( dib, bkcolor ); /*hb_storptr( bkcolor, 2 );*/ hb_retptr( bkcolor ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1809,19 +1619,18 @@ HB_FUNC( FI_GETBACKGROUNDCOLOR ) /* DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); */ HB_FUNC( FI_SETBACKGROUNDCOLOR ) { - - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - /*hb_parinfo( 2 ) & HB_IT_POINTER*/ - hb_parinfo( 2 ) & HB_IT_STRING - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + /*HB_ISPOINTER( 2 )*/ + HB_ISCHAR( 2 ) + ) { - FIBITMAP *dib; - RGBQUAD *bkcolor; + FIBITMAP * dib; + RGBQUAD * bkcolor; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); - bkcolor = (RGBQUAD * ) hb_itemGetCPtr( hb_param( 2, HB_IT_STRING ) ); + bkcolor = ( RGBQUAD * ) hb_itemGetCPtr( hb_param( 2, HB_IT_STRING ) ); /*bkcolor = ( RGBQUAD * ) hb_parptr( 2 );*/ /* run function & return value */ @@ -1831,13 +1640,9 @@ HB_FUNC( FI_SETBACKGROUNDCOLOR ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -1852,12 +1657,11 @@ HB_FUNC( FI_SETBACKGROUNDCOLOR ) /* DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_GetICCProfile(FIBITMAP *dib); */ HB_FUNC( FI_GETICCPROFILE ) { - - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1867,13 +1671,9 @@ HB_FUNC( FI_GETICCPROFILE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1882,14 +1682,13 @@ HB_FUNC( FI_GETICCPROFILE ) /* DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size); */ HB_FUNC( FI_CREATEICCPROFILE ) { - - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; void *data; long size; @@ -1903,14 +1702,10 @@ HB_FUNC( FI_CREATEICCPROFILE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 3, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 3, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) + ); } } @@ -1919,12 +1714,11 @@ HB_FUNC( FI_CREATEICCPROFILE ) /* DLL_API void DLL_CALLCONV FreeImage_DestroyICCProfile(FIBITMAP *dib); */ HB_FUNC( FI_DESTROYICCPROFILE ) { - - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -1935,13 +1729,9 @@ HB_FUNC( FI_DESTROYICCPROFILE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -1995,11 +1785,11 @@ DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To32(BYTE *target, BYTE *source /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO4BITS ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2009,14 +1799,10 @@ HB_FUNC( FI_CONVERTTO4BITS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2025,11 +1811,11 @@ HB_FUNC( FI_CONVERTTO4BITS ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO8BITS ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2039,14 +1825,10 @@ HB_FUNC( FI_CONVERTTO8BITS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2055,11 +1837,11 @@ HB_FUNC( FI_CONVERTTO8BITS ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTOGREYSCALE ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2069,14 +1851,10 @@ HB_FUNC( FI_CONVERTTOGREYSCALE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2085,11 +1863,11 @@ HB_FUNC( FI_CONVERTTOGREYSCALE ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO16BITS555 ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2099,14 +1877,10 @@ HB_FUNC( FI_CONVERTTO16BITS555 ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2115,11 +1889,11 @@ HB_FUNC( FI_CONVERTTO16BITS555 ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO16BITS565 ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2129,14 +1903,10 @@ HB_FUNC( FI_CONVERTTO16BITS565 ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2145,11 +1915,11 @@ HB_FUNC( FI_CONVERTTO16BITS565 ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO24BITS ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2159,14 +1929,10 @@ HB_FUNC( FI_CONVERTTO24BITS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2175,11 +1941,11 @@ HB_FUNC( FI_CONVERTTO24BITS ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO32BITS ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2189,14 +1955,10 @@ HB_FUNC( FI_CONVERTTO32BITS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2205,12 +1967,12 @@ HB_FUNC( FI_CONVERTTO32BITS ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize); */ HB_FUNC( FI_COLORQUANTIZE ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_QUANTIZE quantize; /* Retrieve parameters */ @@ -2222,14 +1984,10 @@ HB_FUNC( FI_COLORQUANTIZE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2243,12 +2001,12 @@ HB_FUNC( FI_COLORQUANTIZE ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm); */ HB_FUNC( FI_DITHER ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_DITHER algorithm; /* Retrieve parameters */ @@ -2260,14 +2018,10 @@ HB_FUNC( FI_DITHER ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2281,11 +2035,11 @@ HB_FUNC( FI_DITHER ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTORGBF ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2295,14 +2049,10 @@ HB_FUNC( FI_CONVERTTORGBF ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2311,30 +2061,26 @@ HB_FUNC( FI_CONVERTTORGBF ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE)); */ HB_FUNC( FI_CONVERTTOSTANDARDTYPE ) { - if ( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() >= 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; BOOL scale_linear; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); - scale_linear = ( hb_parinfo( 2 ) & HB_IT_LOGICAL ) ? hb_parl( 2 ) : TRUE; + scale_linear = ( HB_ISLOG( 2 ) ) ? hb_parl( 2 ) : TRUE; /* run function & return value */ hb_retptr( FreeImage_ConvertToStandardType( dib, scale_linear ) ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2343,33 +2089,29 @@ HB_FUNC( FI_CONVERTTOSTANDARDTYPE ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE)); */ HB_FUNC( FI_CONVERTTOTYPE ) { - if ( hb_pcount() >= 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() >= 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_TYPE dst_type; BOOL scale_linear; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); dst_type = ( FREE_IMAGE_TYPE ) hb_parni( 2 ); - scale_linear = ( hb_parinfo( 3 ) & HB_IT_LOGICAL ) ? hb_parl( 3 ) : TRUE; + scale_linear = ( HB_ISLOG( 3 ) ) ? hb_parl( 3 ) : TRUE; /* run function & return value */ hb_retptr( FreeImage_ConvertToType( dib, dst_type, scale_linear ) ); } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2442,12 +2184,12 @@ HB_FUNC( FI_CONVERTTOTYPE ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle); */ HB_FUNC( FI_ROTATECLASSIC ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; double angle; /* Retrieve parameters */ @@ -2459,13 +2201,9 @@ HB_FUNC( FI_ROTATECLASSIC ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) ); } } @@ -2474,17 +2212,17 @@ HB_FUNC( FI_ROTATECLASSIC ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask); */ HB_FUNC( FI_ROTATEEX ) { - if ( hb_pcount() == 7 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_LOGICAL - ) + if( hb_pcount() == 7 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISLOG( 7 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; double angle, x_shift, y_shift, x_origin, y_origin; BOOL use_mask; @@ -2502,15 +2240,11 @@ HB_FUNC( FI_ROTATEEX ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 7, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), - hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 7, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), + hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ) + ); } } @@ -2519,11 +2253,11 @@ HB_FUNC( FI_ROTATEEX ) /* DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib); */ HB_FUNC( FI_FLIPHORIZONTAL ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2534,13 +2268,9 @@ HB_FUNC( FI_FLIPHORIZONTAL ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -2549,11 +2279,11 @@ HB_FUNC( FI_FLIPHORIZONTAL ) /* DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib); */ HB_FUNC( FI_FLIPVERTICAL ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2564,13 +2294,9 @@ HB_FUNC( FI_FLIPVERTICAL ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) ); } } @@ -2587,14 +2313,14 @@ HB_FUNC( FI_FLIPVERTICAL ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter); */ HB_FUNC( FI_RESCALE ) { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; int dst_width, dst_height; FREE_IMAGE_FILTER filter; @@ -2609,14 +2335,10 @@ HB_FUNC( FI_RESCALE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 4, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 4, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) + ); } } @@ -2633,12 +2355,12 @@ HB_FUNC( FI_RESCALE ) /* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma); */ HB_FUNC( FI_ADJUSTGAMMA ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; double gamma; /* Retrieve parameters */ @@ -2651,14 +2373,10 @@ HB_FUNC( FI_ADJUSTGAMMA ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2667,12 +2385,12 @@ HB_FUNC( FI_ADJUSTGAMMA ) /* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage); */ HB_FUNC( FI_ADJUSTBRIGHTNESS ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; double percentage; /* Retrieve parameters */ @@ -2685,14 +2403,10 @@ HB_FUNC( FI_ADJUSTBRIGHTNESS ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2701,12 +2415,12 @@ HB_FUNC( FI_ADJUSTBRIGHTNESS ) /* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage); */ HB_FUNC( FI_ADJUSTCONTRAST ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; double percentage; /* Retrieve parameters */ @@ -2719,14 +2433,10 @@ HB_FUNC( FI_ADJUSTCONTRAST ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2735,11 +2445,11 @@ HB_FUNC( FI_ADJUSTCONTRAST ) /* DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib); */ HB_FUNC( FI_INVERT ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + HB_ISPOINTER( 1 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); @@ -2750,14 +2460,10 @@ HB_FUNC( FI_INVERT ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 1, - hb_paramError( 1 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 1, + hb_paramError( 1 ) + ); } } @@ -2774,12 +2480,12 @@ HB_FUNC( FI_INVERT ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *dib, FREE_IMAGE_COLOR_CHANNEL channel); */ HB_FUNC( FI_GETCHANNEL ) { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; FREE_IMAGE_COLOR_CHANNEL channel; /* Retrieve parameters */ @@ -2791,14 +2497,10 @@ HB_FUNC( FI_GETCHANNEL ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 2, + hb_paramError( 1 ), hb_paramError( 2 ) + ); } } @@ -2815,15 +2517,15 @@ HB_FUNC( FI_GETCHANNEL ) /* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom); */ HB_FUNC( FI_COPY ) { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) + ) { - FIBITMAP *dib; + FIBITMAP * dib; int left, top, right, bottom; /* Retrieve parameters */ @@ -2838,15 +2540,11 @@ HB_FUNC( FI_COPY ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 5, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), - hb_paramError( 5 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 5, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), + hb_paramError( 5 ) + ); } } @@ -2855,16 +2553,16 @@ HB_FUNC( FI_COPY ) /* DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha); */ HB_FUNC( FI_PASTE ) { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) + ) { - FIBITMAP *dst; - FIBITMAP *src; + FIBITMAP * dst; + FIBITMAP * src; int left, top, alpha; /* Retrieve parameters */ @@ -2880,15 +2578,11 @@ HB_FUNC( FI_PASTE ) } else { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 5, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), - hb_paramError( 5 ) - ); - return; - } + hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, + HB_ERR_FUNCNAME, 5, + hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), + hb_paramError( 5 ) + ); } } diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 4e0cf065d7..8129327fdb 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -342,7 +342,7 @@ static void GDImageCreateFrom( int nType ) /*TraceLog( NULL, "Params = %i, 1 = %i, 2 = %i \n\r", hb_pcount(), hb_parinfo( 1 ), hb_parinfo( 2 ) );*/ if( hb_pcount() == 1 && - ( hb_parinfo( 1 ) & HB_IT_STRING ) + ( HB_ISCHAR( 1 ) ) ) { /* Retrieve file name */ @@ -353,8 +353,8 @@ static void GDImageCreateFrom( int nType ) /* From Image Pointer + size */ else if( hb_pcount() == 2 && - ( hb_parinfo( 1 ) & HB_IT_POINTER ) && - ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) + ( HB_ISPOINTER( 1 ) ) && + ( HB_ISNUM( 2 ) ) ) { @@ -366,15 +366,15 @@ static void GDImageCreateFrom( int nType ) /* From file handle */ else if( hb_pcount() == 2 && - ( hb_parinfo( 1 ) & HB_IT_NUMERIC ) && - ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) + ( HB_ISNUM( 1 ) ) && + ( HB_ISNUM( 2 ) ) ) { HB_FHANDLE fhandle; /* Retrieve file handle */ - fhandle = ( hb_parinfo( 1 ) & HB_IT_NUMERIC ) ? hb_parnl( 1 ) : 0; /* 0 = std input */ + fhandle = ( HB_ISNUM( 1 ) ) ? hb_parnl( 1 ) : 0; /* 0 = std input */ /* Retrieve image size */ sz = hb_parni( 2 ); @@ -428,7 +428,7 @@ static void GDImageCreateFrom( int nType ) static void GDImageSaveTo( int nType ) { if( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -442,8 +442,8 @@ static void GDImageSaveTo( int nType ) /* Get file name or an output handler or NIL it I want a return string */ if( !( HB_ISNIL( 2 ) || - hb_parinfo( 2 ) & HB_IT_STRING || - hb_parinfo( 2 ) & HB_IT_NUMERIC ) ) + HB_ISCHAR( 2 ) || + HB_ISNUM( 2 ) ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Second argument must be NIL or numeric or a string.", @@ -455,7 +455,7 @@ static void GDImageSaveTo( int nType ) /* Retrieve compression level */ /*TraceLog( NULL, "Count = %i\n\r", hb_pcount() ); */ /* check if is numeric */ - if( !( HB_ISNIL( 3 ) || hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) + if( !( HB_ISNIL( 3 ) || HB_ISNUM( 3 ) ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Tirdh argument must be NIL or numeric.", @@ -467,7 +467,7 @@ static void GDImageSaveTo( int nType ) if( nType == IMAGE_JPEG ) { /* check range */ - level = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : -1 ); + level = ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ); if( !( level >= -1 && level <= 95 ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, @@ -480,7 +480,7 @@ static void GDImageSaveTo( int nType ) else if( nType == IMAGE_PNG ) { /* check range */ - level = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : -1 ); + level = ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ); if( !( level >= -1 && level <= 9 ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, @@ -492,7 +492,7 @@ static void GDImageSaveTo( int nType ) } else if( nType == IMAGE_WBMP ) { - if( !( hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) + if( !( HB_ISNUM( 3 ) ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Foreground color nedeed", @@ -528,14 +528,14 @@ static void GDImageSaveTo( int nType ) } /* If i get a file name */ - if( hb_parinfo( 2 ) & HB_IT_STRING ) + if( HB_ISCHAR( 2 ) ) { const char *szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, sz ); } /* Write to file handle (1 = std output) */ - else if( hb_parinfo( 2 ) & HB_IT_NUMERIC ) + else if( HB_ISNUM( 2 ) ) { /* Write to std output or to a passed file */ fhandle = ( hb_parnl( 2 ) > -1 ) ? hb_parnl( 2 ) : 1 ; /* 1 = std output */ @@ -561,7 +561,6 @@ static void GDImageSaveTo( int nType ) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "GDIMAGE* (save functions)", 1, hb_paramError( 1 ) ); - return; } } } @@ -601,8 +600,8 @@ HB_FUNC( GDVERSIONNUMBER ) HB_FUNC( GDIMAGECREATE ) /* gdImagePtr gdImageCreate(sx, sy) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC ) + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; int sx, sy; @@ -624,7 +623,6 @@ HB_FUNC( GDIMAGECREATE ) /* gdImagePtr gdImageCreate(sx, sy) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -643,8 +641,8 @@ HB_FUNC( GDIMAGECREATEPALETTE ) /* gdImagePtr gdImageCreatePalette(sx, sy) */ HB_FUNC( GDIMAGECREATETRUECOLOR ) /* gdImageCreateTrueColor(sx, sy) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC ) + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; int sx, sy; @@ -666,7 +664,6 @@ HB_FUNC( GDIMAGECREATETRUECOLOR ) /* gdImageCreateTrueColor(sx, sy) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -769,7 +766,7 @@ HB_FUNC( GDIMAGEGD ) /* original: void gdImageGD(gdImagePtr im, FILE *out) */ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER ) + HB_ISPOINTER( 1 ) ) { /* gdImagePtr im; @@ -793,7 +790,6 @@ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } @@ -808,10 +804,10 @@ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y, int color) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -839,7 +835,6 @@ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y, hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -849,12 +844,12 @@ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y, HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -885,7 +880,6 @@ HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2 HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -895,12 +889,12 @@ HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2 HB_FUNC( GDIMAGEDASHEDLINE ) /* void gdImageDashedLine(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -931,7 +925,6 @@ HB_FUNC( GDIMAGEDASHEDLINE ) /* void gdImageDashedLine(gdImagePtr im, int x1, in HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -942,9 +935,9 @@ HB_FUNC( GDIMAGEPOLYGON ) /* original: void gdImagePolygon(gdImagePtr im, gdPoin /* implementation: void gdImagePolygon(gdImagePtr im, gdPointPtr points, int color) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISARRAY( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -988,7 +981,6 @@ HB_FUNC( GDIMAGEPOLYGON ) /* original: void gdImagePolygon(gdImagePtr im, gdPoin hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -999,9 +991,9 @@ HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im /* implementation: void gdImageOpenPolygon(gdImagePtr im, gdPointPtr points, int color) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISARRAY( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -1045,7 +1037,6 @@ HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -1056,12 +1047,12 @@ HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -1092,7 +1083,6 @@ HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -1103,9 +1093,9 @@ HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePt /* implementation: void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int color) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISARRAY( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -1149,7 +1139,6 @@ HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePt hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -1159,12 +1148,12 @@ HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePt HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -1195,7 +1184,6 @@ HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im, HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -1205,14 +1193,14 @@ HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im, HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color) */ { if( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) ) { gdImagePtr im; @@ -1244,7 +1232,6 @@ HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, i HB_ERR_FUNCNAME, 8, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ) ); - return; } } } @@ -1254,14 +1241,14 @@ HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, i HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color[, int style]) */ { if( hb_pcount() >= 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) ) { gdImagePtr im; @@ -1283,7 +1270,7 @@ HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int color = hb_parni( 8 ); /* Retrieve style value */ - style = ( hb_parinfo( 9 ) & HB_IT_NUMERIC ? hb_parni( 9 ) : gdNoFill ); + style = ( HB_ISNUM( 9 ) ? hb_parni( 9 ) : gdNoFill ); /* Draw a filled arc */ gdImageFilledArc(im, cx, cy, w, h, s, e, color, style); @@ -1298,7 +1285,6 @@ HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ) ); - return; } } } @@ -1308,12 +1294,12 @@ HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -1343,7 +1329,6 @@ HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -1353,11 +1338,11 @@ HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, int y, int border, int color) */ { if( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) ) { gdImagePtr im; @@ -1386,7 +1371,6 @@ HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, HB_ERR_FUNCNAME, 5, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ) ); - return; } } } @@ -1399,12 +1383,12 @@ HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -1433,7 +1417,6 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -1445,10 +1428,10 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int color) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -1474,7 +1457,6 @@ HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int colo hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -1484,8 +1466,8 @@ HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int colo HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -1508,7 +1490,6 @@ HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, in hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1518,9 +1499,9 @@ HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, in HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend(gdImagePtr im, int c, int dont_blend) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -1547,7 +1528,6 @@ HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -1557,8 +1537,8 @@ HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr brush) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) ) { gdImagePtr im; @@ -1581,7 +1561,6 @@ HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr bru hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1591,8 +1570,8 @@ HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr bru HB_FUNC( GDIMAGESETTILE ) /* void gdImageSetTile(gdImagePtr im, gdImagePtr tile) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) ) { gdImagePtr im; @@ -1615,7 +1594,6 @@ HB_FUNC( GDIMAGESETTILE ) /* void gdImageSetTile(gdImagePtr im, gdImagePtr tile) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1626,8 +1604,8 @@ HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int /* implementation: void gdImageSetStyle(gdImagePtr im, int *style) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY + HB_ISPOINTER( 1 ) && + HB_ISARRAY( 2 ) ) { gdImagePtr im; @@ -1660,7 +1638,6 @@ HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1670,8 +1647,8 @@ HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int thickness) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -1701,7 +1678,6 @@ HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int th hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1711,8 +1687,8 @@ HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int th HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int blending) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) ) { gdImagePtr im; @@ -1735,7 +1711,6 @@ HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1745,8 +1720,8 @@ HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) ) { gdImagePtr im; @@ -1769,7 +1744,6 @@ HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1779,11 +1753,11 @@ HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag HB_FUNC( GDIMAGESETCLIP ) /* void gdImageSetClip(gdImagePtr im, int x1, int y1, int x2, int y2) */ { if( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) ) { gdImagePtr im; @@ -1810,7 +1784,6 @@ HB_FUNC( GDIMAGESETCLIP ) /* void gdImageSetClip(gdImagePtr im, int x1, int y1, HB_ERR_FUNCNAME, 5, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ) ); - return; } } } @@ -1821,7 +1794,7 @@ HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x /* implementation: array gdImageGetClip(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -1852,7 +1825,6 @@ HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -1867,7 +1839,7 @@ HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -1886,7 +1858,6 @@ HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -1896,8 +1867,8 @@ HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -1920,7 +1891,6 @@ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1930,8 +1900,8 @@ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -1954,7 +1924,6 @@ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1964,8 +1933,8 @@ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -1988,7 +1957,6 @@ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -1998,8 +1966,8 @@ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -2022,7 +1990,6 @@ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -2032,7 +1999,7 @@ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2051,7 +2018,6 @@ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2061,7 +2027,7 @@ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2080,7 +2046,6 @@ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2090,9 +2055,9 @@ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2116,7 +2081,6 @@ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) * hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2126,9 +2090,9 @@ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) * HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int y) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2152,7 +2116,6 @@ HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2162,7 +2125,7 @@ HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2181,7 +2144,6 @@ HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ) ); - return; } } } @@ -2191,7 +2153,7 @@ HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2210,7 +2172,6 @@ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2220,7 +2181,7 @@ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2239,7 +2200,6 @@ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2249,9 +2209,9 @@ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImagePtr im, int ditherFlag, int colorsWanted) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2277,7 +2237,6 @@ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImageP hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2287,9 +2246,9 @@ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImageP HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteFromTrueColor(gdImagePtr im, int ditherFlag, int colorsWanted) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2319,7 +2278,6 @@ HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteF hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2329,9 +2287,9 @@ HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteF HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x, int y) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2355,7 +2313,6 @@ HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x, hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2365,9 +2322,9 @@ HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x, HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int x, int y) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { gdImagePtr im; @@ -2391,7 +2348,6 @@ HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -2401,7 +2357,7 @@ HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int HB_FUNC( GDIMAGEGETTHICKNESS ) /* void gdImageGetThickness(gdImagePtr im) */ { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdImagePtr im; @@ -2420,7 +2376,6 @@ HB_FUNC( GDIMAGEGETTHICKNESS ) /* void gdImageGetThickness(gdImagePtr im) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2505,12 +2460,12 @@ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int /* void gdImageString(gdImagePtr im, gdFontPtr font, int x, int y, unsigned char *s, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_STRING && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISCHAR( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -2554,7 +2509,6 @@ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -2565,12 +2519,12 @@ HB_FUNC( GDIMAGESTRINGUP ) /* void gdImageCharUp(gdImagePtr im, gdFontPtr font, /* void gdImageStringUp(gdImagePtr im, gdFontPtr font, int x, int y, unsigned char *s, int color) */ { if( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_STRING && - hb_parinfo( 6 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISCHAR( 5 ) && + HB_ISNUM( 6 ) ) { gdImagePtr im; @@ -2614,7 +2568,6 @@ HB_FUNC( GDIMAGESTRINGUP ) /* void gdImageCharUp(gdImagePtr im, gdFontPtr font, HB_ERR_FUNCNAME, 6, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ) ); - return; } } } @@ -2627,15 +2580,15 @@ HB_FUNC( GDIMAGESTRINGFTEX ) /* TraceLog( NULL, "Parameters: %i, Type 1 =%i=\n\r", hb_pcount(), hb_parinfo( 1 ) ); */ if( hb_pcount() >= 9 && - ( HB_ISNIL( 1 ) || hb_parinfo( 1 ) & ( HB_IT_POINTER ) ) && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_STRING && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_STRING + ( HB_ISNIL( 1 ) || HB_ISPOINTER( 1 ) ) && + HB_ISARRAY( 2 ) && + HB_ISNUM( 3 ) && + HB_ISCHAR( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISCHAR( 9 ) ) { gdImagePtr im; @@ -2698,21 +2651,21 @@ HB_FUNC( GDIMAGESTRINGFTEX ) resolution = 96; /* Retrieve line spacing */ - if( hb_parinfo( 10 ) & HB_IT_DOUBLE ) + if( HB_ISNUM( 10 ) ) { linespacing = hb_parnd( 10 ); flags |= gdFTEX_LINESPACE; } /* Retrieve charmap */ - if( hb_parinfo( 11 ) & HB_IT_NUMERIC ) + if( HB_ISNUM( 11 ) ) { charmap = hb_parni( 11 ); flags |= gdFTEX_CHARMAP; } /* Retrieve resolution */ - if( hb_parinfo( 12 ) & HB_IT_NUMERIC ) + if( HB_ISNUM( 12 ) ) { resolution = hb_parni( 12 ); flags |= gdFTEX_RESOLUTION; @@ -2753,7 +2706,6 @@ HB_FUNC( GDIMAGESTRINGFTEX ) hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ), hb_paramError( 10 ), hb_paramError( 11 ), hb_paramError( 12 ) ); - return; } } } @@ -2765,17 +2717,17 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i /*TraceLog( NULL, "Parameters: %i, Type 9 =%i=\n\r", hb_pcount(), hb_parinfo( 10 ) ); */ if( hb_pcount() == 11 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_STRING && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - ( HB_ISNIL( 9 ) || ( hb_parinfo( 9 ) & HB_IT_STRING ) ) && - ( HB_ISNIL( 10 ) || ( hb_parinfo( 10 ) & HB_IT_STRING ) ) && - hb_parinfo( 11 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISCHAR( 7 ) && + HB_ISNUM( 8 ) && + ( HB_ISNIL( 9 ) || HB_ISCHAR( 9 ) ) && + ( HB_ISNIL( 10 ) || HB_ISCHAR( 10 ) ) && + HB_ISNUM( 11 ) ) { gdImagePtr im; @@ -2832,7 +2784,6 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ), hb_paramError( 10 ), hb_paramError( 11 ) ); - return; } } } @@ -2858,7 +2809,7 @@ HB_FUNC( GDFONTCACHESHUTDOWN ) /* void gdFontCacheShutdown (void) */ HB_FUNC( GDFONTGETWIDTH ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdFontPtr font; @@ -2877,7 +2828,6 @@ HB_FUNC( GDFONTGETWIDTH ) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2887,7 +2837,7 @@ HB_FUNC( GDFONTGETWIDTH ) HB_FUNC( GDFONTGETHEIGHT ) { if( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) ) { gdFontPtr font; @@ -2906,7 +2856,6 @@ HB_FUNC( GDFONTGETHEIGHT ) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } @@ -2920,10 +2869,10 @@ HB_FUNC( GDFONTGETHEIGHT ) HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r, int g, int b) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -2952,7 +2901,6 @@ HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -2962,8 +2910,8 @@ HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -2986,7 +2934,6 @@ HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im, hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -2996,11 +2943,11 @@ HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im, HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr im, int r, int g, int b, int a) */ { if( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) ) { gdImagePtr im; @@ -3034,7 +2981,6 @@ HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr HB_ERR_FUNCNAME, 5, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ) ); - return; } } } @@ -3044,10 +2990,10 @@ HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r, int g, int b) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -3076,7 +3022,6 @@ HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r, hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -3086,11 +3031,11 @@ HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r, HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr im, int r, int g, int b, int a) */ { if( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) ) { gdImagePtr im; @@ -3124,7 +3069,6 @@ HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr i HB_ERR_FUNCNAME, 5, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ) ); - return; } } } @@ -3134,10 +3078,10 @@ HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr i HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -3166,7 +3110,6 @@ HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -3176,10 +3119,10 @@ HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int g, int b) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -3208,7 +3151,6 @@ HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -3218,10 +3160,10 @@ HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r, int g, int b) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -3250,7 +3192,6 @@ HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r, hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -3260,11 +3201,11 @@ HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r, HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr im, int r, int g, int b, int a) */ { if( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) ) { gdImagePtr im; @@ -3298,7 +3239,6 @@ HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr i HB_ERR_FUNCNAME, 5, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ) ); - return; } } } @@ -3308,8 +3248,8 @@ HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr i HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im, int color) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -3332,7 +3272,6 @@ HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3342,9 +3281,9 @@ HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */ { if( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) ) { int r, g, b; @@ -3369,7 +3308,6 @@ HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -3379,10 +3317,10 @@ HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue, int alpha) */ { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISNUM( 1 ) && + HB_ISNUM( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { int r, g, b, a; @@ -3408,7 +3346,6 @@ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) ); - return; } } } @@ -3422,14 +3359,14 @@ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h) */ { if( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) ) { gdImagePtr dst, src; @@ -3466,7 +3403,6 @@ HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int d HB_ERR_FUNCNAME, 8, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ) ); - return; } } } @@ -3476,16 +3412,16 @@ HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int d HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH) */ { if( hb_pcount() == 10 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC && - hb_parinfo( 10 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISNUM( 9 ) && + HB_ISNUM( 10 ) ) { gdImagePtr dst, src; @@ -3530,7 +3466,6 @@ HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImage hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ), hb_paramError( 10 ) ); - return; } } } @@ -3540,16 +3475,16 @@ HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImage HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH) */ { if( hb_pcount() == 10 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC && - hb_parinfo( 10 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISNUM( 9 ) && + HB_ISNUM( 10 ) ) { gdImagePtr dst, src; @@ -3594,7 +3529,6 @@ HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdI hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ), hb_paramError( 10 ) ); - return; } } } @@ -3604,15 +3538,15 @@ HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdI HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImagePtr src, double dstX, double dstY, int srcX, int srcY, int srcW, int srcH, int angle) */ { if( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISNUM( 9 ) ) { gdImagePtr dst, src; @@ -3654,7 +3588,6 @@ HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImage hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ) ); - return; } } } @@ -3664,22 +3597,22 @@ HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImage HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h, int pct) */ { if( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISNUM( 9 ) ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY, w, h, pct; /* Retrieve destination image pointer */ - dst =hb_parGdImage( 1 ); + dst = hb_parGdImage( 1 ); /* Retrieve source image pointer */ src = hb_parGdImage( 2 ); @@ -3713,7 +3646,6 @@ HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ) ); - return; } } } @@ -3723,15 +3655,15 @@ HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h, int pct) */ { if( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + HB_ISNUM( 8 ) && + HB_ISNUM( 9 ) ) { gdImagePtr dst, src; @@ -3772,7 +3704,6 @@ HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdI hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ), hb_paramError( 9 ) ); - return; } } } @@ -3782,8 +3713,8 @@ HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdI HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImagePtr src) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) ) { gdImagePtr dst, src; @@ -3804,7 +3735,6 @@ HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImage hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3814,8 +3744,8 @@ HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImage HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, int radius) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -3838,7 +3768,6 @@ HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, in hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3848,8 +3777,8 @@ HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, in HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + HB_ISNUM( 2 ) ) { gdImagePtr im; @@ -3871,7 +3800,6 @@ HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3885,8 +3813,8 @@ HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER + HB_ISPOINTER( 1 ) && + HB_ISPOINTER( 2 ) ) { gdImagePtr dst, src; @@ -3907,7 +3835,6 @@ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3917,8 +3844,8 @@ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2) HB_FUNC( GDIMAGEINTERLACE ) /* void gdImageInterlace(gdImagePtr im, int interlace) */ { if( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL + HB_ISPOINTER( 1 ) && + HB_ISLOG( 2 ) ) { gdImagePtr im; @@ -3941,7 +3868,6 @@ HB_FUNC( GDIMAGEINTERLACE ) /* void gdImageInterlace(gdImagePtr im, int interlac hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) ); - return; } } } @@ -3972,10 +3898,10 @@ static void AddImageToFile( const char *szFile, const void * iptr, int sz ) HB_FUNC( GDIMAGEGIFANIMBEGIN ) { if( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - ( hb_parinfo( 2 ) & HB_IT_STRING || hb_parinfo( 2 ) & HB_IT_NUMERIC || HB_ISNIL( 2 ) ) && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC + HB_ISPOINTER( 1 ) && + ( HB_ISCHAR( 2 ) || HB_ISNUM( 2 ) || HB_ISNIL( 2 ) ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) ) { gdImagePtr im; @@ -3996,18 +3922,18 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) iptr = gdImageGifAnimBeginPtr(im, &size, GlobalCM, Loops); /* Check if 2nd parameter is a file name or an handle */ - if( hb_parinfo( 2 ) & HB_IT_STRING ) + if( HB_ISCHAR( 2 ) ) { const char *szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, size ); } - else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || HB_ISNIL( 2 ) ) + else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) ) { HB_FHANDLE fhandle; /* Retrieve file handle */ - fhandle = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) ? hb_parnl( 2 ) : 1; /* 1 = std output */ + fhandle = ( HB_ISNUM( 2 ) ) ? hb_parnl( 2 ) : 1; /* 1 = std output */ SaveImageToHandle( fhandle, iptr, size ); } @@ -4019,7 +3945,6 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) ); - return; } } } @@ -4031,14 +3956,14 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) HB_FUNC( GDIMAGEGIFANIMADD ) { if( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - ( hb_parinfo( 2 ) & HB_IT_STRING || hb_parinfo( 2 ) & HB_IT_NUMERIC || HB_ISNIL( 2 ) ) && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - ( hb_parinfo( 8 ) & HB_IT_POINTER || HB_ISNIL( 8 ) ) + HB_ISPOINTER( 1 ) && + ( HB_ISCHAR( 2 ) || HB_ISNUM( 2 ) || HB_ISNIL( 2 ) ) && + HB_ISNUM( 3 ) && + HB_ISNUM( 4 ) && + HB_ISNUM( 5 ) && + HB_ISNUM( 6 ) && + HB_ISNUM( 7 ) && + ( HB_ISPOINTER( 8 ) || HB_ISNIL( 8 ) ) ) { gdImagePtr im, previm; @@ -4060,18 +3985,18 @@ HB_FUNC( GDIMAGEGIFANIMADD ) iptr = gdImageGifAnimAddPtr(im, &size, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); /* Check if 2nd parameter is a file name or an handle */ - if( hb_parinfo( 2 ) & HB_IT_STRING ) + if( HB_ISCHAR( 2 ) ) { const char * szFile = hb_parcx( 2 ); AddImageToFile( szFile, iptr, size ); } - else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || HB_ISNIL( 2 ) ) + else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) ) { HB_FHANDLE fhandle; /* Retrieve file handle */ - fhandle = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) ? hb_parnl( 2 ) : 1; /* 1 = std output */ + fhandle = ( HB_ISNUM( 2 ) ) ? hb_parnl( 2 ) : 1; /* 1 = std output */ SaveImageToHandle( fhandle, iptr, size ); @@ -4087,7 +4012,6 @@ HB_FUNC( GDIMAGEGIFANIMADD ) hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ) ); - return; } } } @@ -4099,7 +4023,7 @@ HB_FUNC( GDIMAGEGIFANIMADD ) HB_FUNC( GDIMAGEGIFANIMEND ) { if( hb_pcount() == 1 && - ( hb_parinfo( 1 ) & HB_IT_STRING || hb_parinfo( 1 ) & HB_IT_NUMERIC || HB_ISNIL( 1 ) ) + ( HB_ISCHAR( 1 ) || HB_ISNUM( 1 ) || HB_ISNIL( 1 ) ) ) { void * iptr; @@ -4109,18 +4033,18 @@ HB_FUNC( GDIMAGEGIFANIMEND ) iptr = gdImageGifAnimEndPtr( &size ); /* Check if 1st parameter is a file name or an handle */ - if( hb_parinfo( 1 ) & HB_IT_STRING ) + if( HB_ISCHAR( 1 ) ) { const char * szFile = hb_parcx( 1 ); AddImageToFile( szFile, iptr, size ); } - else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || HB_ISNIL( 2 ) ) + else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) ) { HB_FHANDLE fhandle; /* Retrieve file handle */ - fhandle = ( hb_parinfo( 1 ) & HB_IT_NUMERIC ) ? hb_parnl( 1 ) : 1; /* 1 = std output */ + fhandle = ( HB_ISNUM( 1 ) ) ? hb_parnl( 1 ) : 1; /* 1 = std output */ SaveImageToHandle( fhandle, iptr, size ); @@ -4135,7 +4059,6 @@ HB_FUNC( GDIMAGEGIFANIMEND ) HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - return; } } } diff --git a/harbour/contrib/hbnf/dispc.c b/harbour/contrib/hbnf/dispc.c index 3873ec4751..68913a35d3 100644 --- a/harbour/contrib/hbnf/dispc.c +++ b/harbour/contrib/hbnf/dispc.c @@ -582,7 +582,7 @@ HB_FUNC( _FT_DFINIT ) norm = hb_parni(7); /* normal color attribute */ hlight = hb_parni(8); /* highlight color attribute */ - if (hb_parinfo(9) & HB_IT_ARRAY) /* if array */ + if( HB_ISARRAY( 9 ) ) { keytype = K_LIST; kcount = hb_parinfa( 9, 0 );