From 63ef8ff6e0526ed2ed8775d90251320459ed62af Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 3 Jul 2008 13:13:26 +0000 Subject: [PATCH] 2008-07-03 15:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu) - hbgd/tests/images_in - hbgd/tests/images_out + hbgd/tests/imgs_in + hbgd/tests/imgs_out * hbgd/tests/gdtest.prg * hbgd/tests/bartest.prg * hbgd/tests/barms.prg * hbgd/tests/test_out.prg * hbgd/tests/tostring.prg * hbgd/tests/gdtestcl.prg * hbgd/tests/animgif.prg * hbgd/tests/testdpi.prg * hbgd/tests/counter.prg * hbgd/tests/antialia.prg * Removing long filenames in hbgd (part 2/3) ! Added SVN headers. ! Fixed to not use hbcompat.ch. 2008-07-03 14:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbgd/Makefile * contrib/hbgd/common.mak - contrib/hbgd/gdexternal.ch + contrib/hbgd/gdextern.ch - contrib/hbgd/tests/gdtestcls.prg + contrib/hbgd/tests/gdtestcl.prg - contrib/hbgd/tests/antialiased.prg + contrib/hbgd/tests/antialia.prg ! Removing long filenames in hbgd (part 1/3) --- harbour/ChangeLog | 21 +++++++++++++++- harbour/contrib/hbgd/tests/animgif.prg | 4 +-- harbour/contrib/hbgd/tests/antialia.prg | 4 +-- harbour/contrib/hbgd/tests/barms.prg | 5 +++- harbour/contrib/hbgd/tests/bartest.prg | 5 +++- harbour/contrib/hbgd/tests/counter.prg | 3 +-- harbour/contrib/hbgd/tests/gdtest.prg | 4 +-- harbour/contrib/hbgd/tests/gdtestcl.prg | 7 +++--- .../{images_in => imgs_in}/conv_test.jpg | Bin .../{images_in => imgs_in}/gdlogobig.png | Bin .../{images_in => imgs_in}/theclipper.gif | Bin harbour/contrib/hbgd/tests/test_out.prg | 23 +++++++++--------- harbour/contrib/hbgd/tests/testdpi.prg | 8 ++++-- harbour/contrib/hbgd/tests/tostring.prg | 4 +-- 14 files changed, 57 insertions(+), 31 deletions(-) rename harbour/contrib/hbgd/tests/{images_in => imgs_in}/conv_test.jpg (100%) rename harbour/contrib/hbgd/tests/{images_in => imgs_in}/gdlogobig.png (100%) rename harbour/contrib/hbgd/tests/{images_in => imgs_in}/theclipper.gif (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 685719af68..15ff4414b4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-03 15:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + - hbgd/tests/images_in + - hbgd/tests/images_out + + hbgd/tests/imgs_in + + hbgd/tests/imgs_out + * hbgd/tests/gdtest.prg + * hbgd/tests/bartest.prg + * hbgd/tests/barms.prg + * hbgd/tests/test_out.prg + * hbgd/tests/tostring.prg + * hbgd/tests/gdtestcl.prg + * hbgd/tests/animgif.prg + * hbgd/tests/testdpi.prg + * hbgd/tests/counter.prg + * hbgd/tests/antialia.prg + * Removing long filenames in hbgd (part 2/3) + ! Added SVN headers. + ! Fixed to not use hbcompat.ch. + 2008-07-03 14:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbgd/Makefile * contrib/hbgd/common.mak @@ -17,7 +36,7 @@ + contrib/hbgd/tests/gdtestcl.prg - contrib/hbgd/tests/antialiased.prg + contrib/hbgd/tests/antialia.prg - ! Removing long filenames in hbgd (part 1/2) + ! Removing long filenames in hbgd (part 1/3) 2008-07-03 14:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbbmcdx/Makefile diff --git a/harbour/contrib/hbgd/tests/animgif.prg b/harbour/contrib/hbgd/tests/animgif.prg index 8828b7c4b7..31a47e7e62 100644 --- a/harbour/contrib/hbgd/tests/animgif.prg +++ b/harbour/contrib/hbgd/tests/animgif.prg @@ -13,8 +13,8 @@ #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main() diff --git a/harbour/contrib/hbgd/tests/antialia.prg b/harbour/contrib/hbgd/tests/antialia.prg index 06748a5d4e..a23f48f7d6 100644 --- a/harbour/contrib/hbgd/tests/antialia.prg +++ b/harbour/contrib/hbgd/tests/antialia.prg @@ -11,8 +11,8 @@ #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main() diff --git a/harbour/contrib/hbgd/tests/barms.prg b/harbour/contrib/hbgd/tests/barms.prg index 8597206efe..61f8e877b2 100644 --- a/harbour/contrib/hbgd/tests/barms.prg +++ b/harbour/contrib/hbgd/tests/barms.prg @@ -1,5 +1,8 @@ +/* + * $Id$ + */ -#define IMAGES_OUT "images_out/" +#define IMAGES_OUT "imgs_out/" Function Main() diff --git a/harbour/contrib/hbgd/tests/bartest.prg b/harbour/contrib/hbgd/tests/bartest.prg index a103a9062e..d4174485df 100644 --- a/harbour/contrib/hbgd/tests/bartest.prg +++ b/harbour/contrib/hbgd/tests/bartest.prg @@ -1,5 +1,8 @@ +/* + * $Id$ + */ -#define IMAGES_OUT "images_out/" +#define IMAGES_OUT "imgs_out/" Function Main() diff --git a/harbour/contrib/hbgd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg index d387869922..8f96c4e8a7 100644 --- a/harbour/contrib/hbgd/tests/counter.prg +++ b/harbour/contrib/hbgd/tests/counter.prg @@ -11,12 +11,11 @@ * i.e.: counter 34524 */ - #include "gd.ch" #include "common.ch" #define IMAGES_IN "digits/" -#define IMAGES_OUT "images_out/" +#define IMAGES_OUT "imgs_out/" #define DISPLAY_NUM 10 diff --git a/harbour/contrib/hbgd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg index 6ce4575b39..9954250244 100644 --- a/harbour/contrib/hbgd/tests/gdtest.prg +++ b/harbour/contrib/hbgd/tests/gdtest.prg @@ -11,8 +11,8 @@ #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main() diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg index 55a5e41ec6..8e19f08475 100644 --- a/harbour/contrib/hbgd/tests/gdtestcl.prg +++ b/harbour/contrib/hbgd/tests/gdtestcl.prg @@ -8,12 +8,11 @@ * GD Class test file */ - #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main() @@ -237,7 +236,7 @@ PROCEDURE Main() red := oI5:SetColor(250, 0, 0) // Load an image as brush - oB := GDImage():LoadFromGif( IMAGES_IN + "theclipper.gif" ) + oB := GDImage():LoadFromGif( IMAGES_IN + "harbour.gif" ) oB:Zoom(15) //oI5:Circle( 200, 200, oI5:Width() ) diff --git a/harbour/contrib/hbgd/tests/images_in/conv_test.jpg b/harbour/contrib/hbgd/tests/imgs_in/conv_test.jpg similarity index 100% rename from harbour/contrib/hbgd/tests/images_in/conv_test.jpg rename to harbour/contrib/hbgd/tests/imgs_in/conv_test.jpg diff --git a/harbour/contrib/hbgd/tests/images_in/gdlogobig.png b/harbour/contrib/hbgd/tests/imgs_in/gdlogobig.png similarity index 100% rename from harbour/contrib/hbgd/tests/images_in/gdlogobig.png rename to harbour/contrib/hbgd/tests/imgs_in/gdlogobig.png diff --git a/harbour/contrib/hbgd/tests/images_in/theclipper.gif b/harbour/contrib/hbgd/tests/imgs_in/theclipper.gif similarity index 100% rename from harbour/contrib/hbgd/tests/images_in/theclipper.gif rename to harbour/contrib/hbgd/tests/imgs_in/theclipper.gif diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index 1f3d165c4b..14090d4951 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -10,7 +10,6 @@ #include "gd.ch" #include "common.ch" -#include "hbcompat.ch" #command WRITE => FWrite( 1, + CHR(13)+CHR(10) ) #command OutHTML => WRITE @@ -20,7 +19,7 @@ PROCEDURE Main(...) LOCAL cPar LOCAL aParams := hb_aParams() LOCAL cQuery := GetEnv( "QUERY_STRING" ) - LOCAL hParams := Hash() + LOCAL hParams := hb_Hash() LOCAL cText, cImg, nPt, nSize, nWidth, nHeight, cPhoto @@ -40,22 +39,22 @@ PROCEDURE Main(...) do case case cPar == "txt" - cText := hGet( hParams, cPar ) + cText := hb_hGet( hParams, cPar ) case cPar == "img" - cImg := hGet( hParams, cPar ) + cImg := hb_hGet( hParams, cPar ) case cPar == "photo" - cPhoto := hGet( hParams, cPar ) + cPhoto := hb_hGet( hParams, cPar ) case cPar == "width" - nWidth := Val( hGet( hParams, cPar ) ) + nWidth := Val( hb_hGet( hParams, cPar ) ) case cPar == "height" - nHeight := Val( hGet( hParams, cPar ) ) + nHeight := Val( hb_hGet( hParams, cPar ) ) case cPar == "pt" - nPt := Val( hGet( hParams, cPar ) ) + nPt := Val( hb_hGet( hParams, cPar ) ) endcase NEXT @@ -212,7 +211,7 @@ PROCEDURE OutJpg( cText, nPitch ) RETURN FUNCTION GetVars( cFields, cSeparator ) - LOCAL hHashVars := Hash() + LOCAL hHashVars := hb_Hash() LOCAL aField, cField, aFields LOCAL cName, xValue DEFAULT cSeparator TO "&" @@ -248,7 +247,7 @@ FUNCTION GetVars( cFields, cSeparator ) RETURN hHashVars FUNCTION GetParams( aParams ) - LOCAL hHashVars := Hash() + LOCAL hHashVars := hb_Hash() LOCAL aField, cField, aFields LOCAL cName, xValue @@ -299,7 +298,7 @@ FUNCTION URLDecode( cStr ) CASE cCar == "%" i ++ - cRet += Chr( HexToNum( SubStr( cStr, i, 2 ) ) ) + cRet += Chr( hb_HexToNum( SubStr( cStr, i, 2 ) ) ) i ++ OTHERWISE @@ -339,7 +338,7 @@ FUNCTION URLEncode( cStr ) OTHERWISE nVal := Asc( cCar ) - cRet += "%" + NumToHex( nVal ) + cRet += "%" + hb_NumToHex( nVal ) ENDCASE NEXT diff --git a/harbour/contrib/hbgd/tests/testdpi.prg b/harbour/contrib/hbgd/tests/testdpi.prg index 4a9abcc8d2..80fb1d7f2d 100644 --- a/harbour/contrib/hbgd/tests/testdpi.prg +++ b/harbour/contrib/hbgd/tests/testdpi.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + /* * GD graphic library. * graphic font DPI demo @@ -8,8 +12,8 @@ #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main() diff --git a/harbour/contrib/hbgd/tests/tostring.prg b/harbour/contrib/hbgd/tests/tostring.prg index 286df308fd..f18dca899b 100644 --- a/harbour/contrib/hbgd/tests/tostring.prg +++ b/harbour/contrib/hbgd/tests/tostring.prg @@ -12,8 +12,8 @@ #include "gd.ch" #include "common.ch" -#define IMAGES_IN "images_in/" -#define IMAGES_OUT "images_out/" +#define IMAGES_IN "imgs_in/" +#define IMAGES_OUT "imgs_out/" PROCEDURE Main()