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

2012-11-20 03:08 UTC+0100 Firstname Lastname (me domain.net)

Browse Source 
* contrib/hbgd/gdwrp.c
    * minor cleanup

  * src/rtl/gtsln/Makefile
    * reverted prev for inclusion in gtsln.h itself
This commit is contained in:
Viktor Szakats
2012-11-20 02:09:32 +00:00
parent d6f541097f
commit f867f7349a
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-20 03:08 UTC+0100 Firstname Lastname (me domain.net)
* contrib/hbgd/gdwrp.c
* minor cleanup
* src/rtl/gtsln/Makefile
* reverted prev for inclusion in gtsln.h itself
2012-11-20 02:18 UTC+0100 Firstname Lastname (me domain.net)
* ChangeLog
* doc/howtorep.txt

8
harbour/contrib/hbgd/gdwrp.c
View File

@@ -1470,7 +1470,7 @@ HB_FUNC( GDIMAGESTRINGFTEX )
gdImagePtr im = hb_parGdImage( 1 );
PHB_ITEM pRect = hb_param( 2, HB_IT_ARRAY );
int fg = hb_parni( 3 ); /* foreground color */
int fgcolor = hb_parni( 3 ); /* foreground color */
const char * fontname = hb_parc( 4 );
double ptsize = hb_parnd( 5 ); /* point size */
double angle = hb_parnd( 6 ); /* angle value in radians */
@@ -1525,7 +1525,7 @@ HB_FUNC( GDIMAGESTRINGFTEX )
}
/* Write string */
err = gdImageStringFTEx( im, &aRect[ 0 ], fg, ( char * ) fontname, ptsize, angle, x, y, ( char * ) string, ( flags != 0 ? &extra : NULL ) );
err = gdImageStringFTEx( im, &aRect[ 0 ], fgcolor, ( char * ) fontname, ptsize, angle, x, y, ( char * ) string, ( flags != 0 ? &extra : NULL ) );
if( ! err )
{
/* Save in array the correct text rectangle dimensions */
@@ -1562,14 +1562,14 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i
double radius = hb_parnd( 4 );
double textRadius = hb_parnd( 5 );
double fillPortion = hb_parnd( 6 );
const char * font = hb_parc( 7 ); /* fontname */
const char * fontname = hb_parc( 7 );
double points = hb_parnd( 8 );
const char * top = hb_parcx( 9 );
const char * bottom = hb_parcx( 10 );
int fgcolor = hb_parni( 11 ); /* foreground color */
/* Write string */
hb_retc( gdImageStringFTCircle( im, cx, cy, radius, textRadius, fillPortion, ( char * ) font, points, ( char * ) top, ( char * ) bottom, fgcolor ) );
hb_retc( gdImageStringFTCircle( im, cx, cy, radius, textRadius, fillPortion, ( char * ) fontname, points, ( char * ) top, ( char * ) bottom, fgcolor ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );

4
harbour/src/rtl/gtsln/Makefile
View File

@@ -21,10 +21,6 @@ ifneq ($(HB_HAS_SLANG),)
HB_CFLAGS += $(foreach d,$(HB_HAS_SLANG),-I$(d))
ifeq ($(HB_PLATFORM),aix)
HB_CFLAGS := -DREAL_UNIX_SYSTEM
endif
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
endif