From 71928f06cb1f6563a1a8a0ce83f445d6c35931a9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Feb 2009 21:42:40 +0000 Subject: [PATCH] 2009-02-20 22:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbgd/gdwrp.c ! Fixed double implementation of GDIMAGEELLIPSE(). The so far inactive .c version got enabled by recently making lib version detection automatic, which made it collide with the existing .prg implementation. Left the .prg one active because it works regardless of the lib gd version. Francesco, please verify me. - Deleted disabled, probably older copy of GDIMAGEELLIPSE() from .c source. * utils/hbmk2/hbmk2.prg * Help screen update. --- harbour/ChangeLog | 28 +++++++++++++----- harbour/contrib/hbgd/gdwrp.c | 53 +++-------------------------------- harbour/utils/hbmk2/hbmk2.prg | 6 ++-- 3 files changed, 29 insertions(+), 58 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fb14611299..849de909ba 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-20 22:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbgd/gdwrp.c + ! Fixed double implementation of GDIMAGEELLIPSE(). + The so far inactive .c version got enabled by recently + making lib version detection automatic, which made it + collide with the existing .prg implementation. + Left the .prg one active because it works regardless + of the lib gd version. Francesco, please verify me. + - Deleted disabled, probably older copy of GDIMAGEELLIPSE() + from .c source. + + * utils/hbmk2/hbmk2.prg + * Help screen update. + 2009-02-20 19:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/hb-func.sh ! Fixed gtalleg lib name. @@ -105,7 +119,7 @@ ! Fixed not to use '$' sign in generated temp filename. ! Fixed recent typo causing RTE in *nix. ; After these changes linux/gcc works out of the box, but - it still needs tweaking (x11, other libs). + it still needs tweaking (X11, other libs). 2009-02-20 13:43 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/common/hbver.c @@ -134,7 +148,7 @@ + Added remaining system libs for linux, sunos and hpux. + Added a more complete set of win system libs for mingw. TODO: Some more generic solution needs to be developed - because currently the win systems libs add by our + because currently the win systems libs added by our tools are pretty much random across the different supported compilers. + Added system lib list for mingwce. @@ -269,7 +283,7 @@ 2009-02-19 16:50 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/source/rtl/gtwvt/gtwvt.c - * Fixed not to generate RT if class is already been registered. + * Fixed not to generate RTE if class is already been registered. Useful in cases where multiple windows are implemented. 2009-02-20 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) @@ -327,7 +341,7 @@ 2009-02-19 12:59 UTC-0600 Teo Fonrouge (teo/at/windtelsoft/dot/com) * common.mak - * changed HBM_KDIR from "utils\hbmk" to "utils\hbmk2" + * changed HBMK_DIR from "utils\hbmk" to "utils\hbmk2" - utils/hbmk + utils/hbmk2 @@ -380,7 +394,7 @@ + Added -arch= command line option. Same as HB_ARCHITECTURE. Added -comp= command line option. Same as HB_COMPILER. envvars are kept for compatibility. - + Added -hblnk option to give plave for hblnk script behaviour + + Added -hblnk option to give place for hblnk script behaviour emulation. * Changed -cc, -cmp options to -hbcc, -hbcmp respecitvely. + Changed -hbcc, -hbcmp, -hblnk switches to turn off information @@ -425,7 +439,7 @@ problems with double extensions and final .c file cleanup. ! Fixed to add hbdebug lib when building in shared mode. ! Fixed typo in automatically adding './' on *nix systems. - ; Please test, I definitely couldn't retest all scenaros + ; Please test, I definitely couldn't retest all scenarios after all these changes. * bin/postinst.bat @@ -607,7 +621,7 @@ * source/rtl/gtwvt/gtwvt.c + Protected non-Clipper compatible extension regarding K_MM*DOWN with __HB_GTWVT_GEN_K_MMDOWN_EVENTS #define. - Also see notes in about app level code modification + Also see notes about app level code modification needed if you want to continue using default Harbour build: 2009-02-18 12:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 91dbbcff41..c756113d0f 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -1088,53 +1088,6 @@ HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int /* ---------------------------------------------------------------------------*/ -#if 0 -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 - ) - { - gdImagePtr im; - int cx, cy, w, h, color; - - /* Retrieve image pointer */ - im = hb_parGdImage( 1 ); - - /* Retrieve point values */ - cx = hb_parni( 2 ); - cy = hb_parni( 3 ); - /* Retrieve width and height values */ - w = hb_parni( 4 ); - h = hb_parni( 5 ); - /* Retrieve color value */ - color = hb_parni( 6 ); - - /* Draw an ellipse */ - gdImageEllipse(im, cx, cy, w, h, color); - - } - else - { - /* Parameter error */ - { - hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, - HB_ERR_FUNCNAME, 2, - hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ), - hb_paramError( 5 ), hb_paramError( 6 ) ); - return; - } - } -} -#endif - -/* ---------------------------------------------------------------------------*/ - HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int pointsTotal, int color) */ /* implementation: void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int color) */ { @@ -1271,7 +1224,6 @@ HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, i /* Draw an arc */ gdImageArc(im, cx, cy, w, h, s, e, color); - } else { @@ -1429,6 +1381,9 @@ HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, } /* ---------------------------------------------------------------------------*/ +/* Disabled, because there is a .prg implementation which + works with all gd lib versions. [vszakats] */ +#if 0 #if HB_GD_VERS( 2, 0, 35 ) HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color) */ { @@ -1458,7 +1413,6 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, /* Draw a filled ellipse */ gdImageEllipse(im, cx, cy, w, h, color); - } else { @@ -1473,6 +1427,7 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, } } #endif /* ( GD_VERS >= 2035 ) */ +#endif /* ---------------------------------------------------------------------------*/ diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 14fccf9260..b331c5930d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2056,14 +2056,14 @@ STATIC PROCEDURE ShowHelp( lLong ) " -help long help" } LOCAL aText_Long := {; - " -[no]fmstat enable/disable runtime memory statistics" ,; - " (currently available for gcc compilers)" ,; " -nulrdd[-] link with nulrdd" ,; " -bldf[-] inherit all/no (default) flags from Harbour build" ,; " -bldf=[p][c][l] inherit .prg/.c/linker flags (or none) from Harbour build" ,; " -[no]debug add/exclude debug info" ,; " -[no]map create (or not) a map file" ,; " -[no]strip strip (no strip) binaries" ,; + " -[no]fmstat enable/disable runtime memory statistics" ,; + " (currently available for gcc builds only)" ,; " -[no]trace show commands executed" ,; " -[no]run run/don't run the created executable" ,; " -nohbp do not process .hbp files in current directory" ,; @@ -2084,6 +2084,8 @@ STATIC PROCEDURE ShowHelp( lLong ) " -