fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-12-01 16:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* bin/hb-mkimp.bat
    * Minor.

  * contrib/hbwin/win_dll.c
  * contrib/hbcairo/paths.c
  * contrib/hbcairo/text.c
  * contrib/hbcairo/core.c
  * contrib/hbcairo/Makefile
    * Minor cleanups.
    ! Fixed minor typo.
This commit is contained in:
Viktor Szakats
2009-12-01 15:09:59 +00:00
parent e4de0530ba
commit 41fb98f2e9
7 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-01 16:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-mkimp.bat
* Minor.
* contrib/hbwin/win_dll.c
* contrib/hbcairo/paths.c
* contrib/hbcairo/text.c
* contrib/hbcairo/core.c
* contrib/hbcairo/Makefile
* Minor cleanups.
! Fixed minor typo.
2009-12-01 16:56 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/hbcairo/context.c
* harbour/contrib/hbcairo/paths.c

4
harbour/bin/hb-mkimp.bat
View File

@@ -209,11 +209,11 @@ rem ---------------------------------------------------------------
echo s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _hbtemp.sed
echo }>> _hbtemp.sed
echo }>> _hbtemp.sed
dumpbin /exports "%2" > _dump.tmp
dumpbin -exports "%2" > _dump.tmp
echo LIBRARY "%~n2" > _temp.def
echo EXPORTS >> _temp.def
sed -nf _hbtemp.sed < _dump.tmp >> _temp.def
lib /nologo /machine:%1 /def:_temp.def /out:"%3"
lib -nologo -machine:%1 -def:_temp.def -out:"%3"
del _dump.tmp
del _temp.def
del _hbtemp.sed

2
harbour/contrib/hbcairo/Makefile
View File

@@ -17,8 +17,6 @@ C_SOURCES := \
png.c \
text.c \
PRG_SOURCES := \
PRG_HEADERS := \
hbcairo.ch \

20
harbour/contrib/hbcairo/core.c
View File

@@ -317,12 +317,11 @@ static const HB_GC_FUNCS s_gcIteratorFuncs =
HB_FUNC( CAIRO_PATH_ITERATOR_CREATE )
{
PHB_CAIRO_PATH_ITERATOR pIterator;
cairo_path_t * pPath = hb_cairo_path_param( 1 );
if( pPath )
{
pIterator = ( PHB_CAIRO_PATH_ITERATOR ) hb_gcAllocate( sizeof( PHB_CAIRO_PATH_ITERATOR ), &s_gcIteratorFuncs );
PHB_CAIRO_PATH_ITERATOR pIterator = ( PHB_CAIRO_PATH_ITERATOR ) hb_gcAllocate( sizeof( PHB_CAIRO_PATH_ITERATOR ), &s_gcIteratorFuncs );
#ifdef HB_USE_ITEM
pIterator->pPath = hb_itemNew( hb_param( 1, HB_IT_POINTER ) );
#else
@@ -332,7 +331,6 @@ HB_FUNC( CAIRO_PATH_ITERATOR_CREATE )
pIterator->iPos = -1;
hb_itemPutPtrGC( hb_stackReturnItem(), pIterator );
}
}
@@ -348,9 +346,9 @@ HB_FUNC( CAIRO_PATH_ITERATOR_DESTROY )
hb_gcRefDec( pIterator->pPath );
#endif
pIterator->pPath = NULL;
return;
}
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
else
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -379,9 +377,9 @@ HB_FUNC( CAIRO_PATH_ITERATOR_NEXT )
hb_retni( pPath->data[ pIterator->iPos ].header.type );
else
hb_ret();
return;
}
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
else
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -416,9 +414,9 @@ HB_FUNC( CAIRO_PATH_ITERATOR_GET_POINTS )
}
else
hb_ret();
return;
}
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
else
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -465,7 +463,7 @@ HB_FUNC( CAIRO_PATH_ITERATOR_SET_POINTS )
}
else
hb_retl( 0 );
return;
}
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
else
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}

2
harbour/contrib/hbcairo/paths.c
View File

@@ -154,10 +154,10 @@ HB_FUNC( CAIRO_REL_MOVE_TO )
HB_FUNC( CAIRO_TEXT_PATH )
{
void * hText;
cairo_t * pCairo = hb_cairo_param( 1 );
if( pCairo )
{
void * hText;
cairo_text_path( pCairo, hb_parstr_utf8( 2, &hText, NULL ) );
hb_strfree( hText );
}

11
harbour/contrib/hbcairo/text.c
View File

@@ -57,10 +57,10 @@
HB_FUNC( CAIRO_SELECT_FONT_FACE )
{
void * hFamily;
cairo_t * pCairo = hb_cairo_param( 1 );
if( pCairo )
{
void * hFamily;
cairo_select_font_face( pCairo, hb_parstr_utf8( 2, &hFamily, NULL ), ( cairo_font_slant_t ) hb_parni( 3 ), ( cairo_font_weight_t ) hb_parni( 4 ) );
hb_strfree( hFamily );
}
@@ -77,10 +77,10 @@ HB_FUNC( CAIRO_SET_FONT_SIZE )
HB_FUNC( CAIRO_SHOW_TEXT )
{
void * hText;
cairo_t * pCairo = hb_cairo_param( 1 );
if( pCairo )
{
void * hText;
cairo_show_text( pCairo, hb_parstr_utf8( 2, &hText, NULL ) );
hb_strfree( hText );
}
@@ -89,16 +89,16 @@ HB_FUNC( CAIRO_SHOW_TEXT )
HB_FUNC( CAIRO_TEXT_EXTENTS )
{
void * hText;
cairo_t * pCairo = hb_cairo_param( 1 );
cairo_text_extents_t te;
if( pCairo )
{
void * hText;
PHB_ITEM pItem = hb_stackReturnItem();
cairo_text_extents_t te;
cairo_text_extents( pCairo, hb_parstr_utf8( 2, &hText, NULL ), &te );
hb_strfree( hText );
hb_arrayNew( pItem, 6 )
hb_arrayNew( pItem, 6 );
hb_arraySetND( pItem, 1, te.x_bearing );
hb_arraySetND( pItem, 2, te.y_bearing );
hb_arraySetND( pItem, 3, te.width );
@@ -107,4 +107,3 @@ HB_FUNC( CAIRO_TEXT_EXTENTS )
hb_arraySetND( pItem, 6, te.y_advance );
}
}

1
harbour/contrib/hbwin/win_dll.c
View File

@@ -606,7 +606,6 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, PXPP_DLLEXEC xec
default:
hb_errRT_BASE( EG_ARG, 2010, "Unknown return type from DLL function", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
break;
}
}