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

2007-05-09 10:10 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)

Browse Source 
* harbour/config/w32/mingw32.cf
    * fixed typo
  * harbour/include/Makefile
    * removed reference to deleted hbrddwrk.h
  * harbour/include/std.ch
    * added SET EOL <x> clause
  * harbour/include/hbcompat.ch
    * fixed typos and added TEXT INTO
  * harbour/contrib/gd/Makefile
    * fixed install of includes
  * harbour/contrib/gd/gdwrp.c
    * fixed warnings
This commit is contained in:
Lorenzo Fiorini
2007-05-09 08:08:49 +00:00
parent af6b7fdd86
commit 60f8ef1aa4
7 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-05-09 10:10 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
* harbour/config/w32/mingw32.cf
* fixed typo
* harbour/include/Makefile
* removed reference to deleted hbrddwrk.h
* harbour/include/std.ch
* added SET EOL <x> clause
* harbour/include/hbcompat.ch
* fixed typos and added TEXT INTO
* harbour/contrib/gd/Makefile
* fixed install of includes
* harbour/contrib/gd/gdwrp.c
* fixed warnings
2007-05-08 16:06 UTC+0300 Chen Kedem <niki@actcom.co.il>
* source/rtl/mlctopos.c
! Make the function MLCTOPOS() more compatible.

2
harbour/config/w32/mingw32.cf
View File

@@ -55,7 +55,7 @@ LDLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LDLIB += -l$(HB_GT_DEFAULT)
LDLIBS += -l$(HB_GT_DEFAULT)
endif
endif

9
harbour/contrib/gd/Makefile
View File

@@ -15,12 +15,10 @@ PRG_SOURCES=\
gdbar.prg \
gdchart.prg \
gdimage.prg \
gdbarcod.prg
gdbarcod.prg \
LIBNAME=hbgd
include $(TOP)$(ROOT)config/lib.cf
ifeq ($(HB_COMPILER),mingw32)
CFLAGS := $(CFLAGS) -I/usr/include
else
@@ -28,4 +26,9 @@ else
endif
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

42
harbour/contrib/gd/gdwrp.c
View File

@@ -175,26 +175,9 @@ static void SaveImageToFile( char *szFile, void *iptr, int sz )
/* ---------------------------------------------------------------------------*/
static void AddImageToFile( char *szFile, void *iptr, int sz )
{
FHANDLE fhandle;
if ( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READWRITE ) ) != FS_ERROR )
{
/* move to end of file */
hb_fsSeek(fhandle, 0, FS_END);
/* Write Image */
SaveImageToHandle( fhandle, ( BYTE *) iptr, (ULONG) sz );
/* Close file */
hb_fsClose( fhandle );
}
}
static void GDImageCreateFrom( int nType )
{
gdImagePtr im;
gdImagePtr im = NULL;
char *szFile;
int sz;
void *iptr;
@@ -294,9 +277,9 @@ static void GDImageSaveTo( int nType )
gdImagePtr im;
char *szFile;
int sz;
void *iptr;
void *iptr = NULL;
FHANDLE fhandle;
int level, fg;
int level = 0, fg = 0;
/* Retrieve image pointer */
im = (gdImagePtr)hb_parptr(1);
@@ -3830,6 +3813,24 @@ HB_FUNC( GDIMAGEINTERLACE ) // void gdImageInterlace(gdImagePtr im, int interlac
/* ---------------------------------------------------------------------------*/
#if ( GD_VERS >= 2033 )
static void AddImageToFile( char *szFile, void *iptr, int sz )
{
FHANDLE fhandle;
if ( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READWRITE ) ) != FS_ERROR )
{
/* move to end of file */
hb_fsSeek(fhandle, 0, FS_END);
/* Write Image */
SaveImageToHandle( fhandle, ( BYTE *) iptr, (ULONG) sz );
/* Close file */
hb_fsClose( fhandle );
}
}
//BGD_DECLARE(void *) gdImageGifAnimBeginPtr(gdImagePtr im, int *size, int GlobalCM, int Loops);
// implementation: (void *) gdImageGifAnimBegin( gdImagePtr im, cFile | nHandle, int GlobalCM, int Loops);
HB_FUNC( GDIMAGEGIFANIMBEGIN )
@@ -4008,6 +4009,5 @@ HB_FUNC( GDIMAGEGIFANIMEND )
}
}
/* ---------------------------------------------------------------------------*/
#endif // ( GD_VERS >= 2033 )

1
harbour/include/Makefile
View File

@@ -41,7 +41,6 @@ C_HEADERS=\
hbrdddel.h \
hbrddntx.h \
hbrddsdf.h \
hbrddwrk.h \
hbregex.h \
hbset.h \
hbsetup.h \

6
harbour/include/hbcompat.ch
View File

@@ -67,7 +67,7 @@
#xtranslate hb_gtInfo([<xx,...>]) => gtInfo([<xx>])
#xtranslate hb_gtVersion([<xx>]) => hb_gt_Version([<xx>])
#xtranslate isregex([<xx>]) => isregexstring([<xx>])
#xtranslate hb_isregex([<xx>]) => hb_isregexstring([<xx>])
#else
@@ -82,7 +82,7 @@
#xtranslate gfxPrimitive([<xx,...>])=> hb_gfxPrimitive([<xx>])
#xtranslate gfxText([<xx,...>]) => hb_gfxText([<xx>])
#xtranslate isregexstring([<xx>]) => isregex([<xx>])
#xtranslate hb_isregexstring([<xx>]) => hb_isregex([<xx>])
/* SWITCH ... ; case ... ; DEFAULT ; ... ; END */
#xcommand DEFAULT => OTHERWISE
@@ -116,6 +116,8 @@
#xtranslate NUMTOHEX(<n>) => NTOC(<n>, 16)
#xtranslate HEXTONUM(<c>) => CTON(<c>, 16)
#xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
#endif
#endif /* __HARBOUR__ */

1
harbour/include/std.ch
View File

@@ -667,6 +667,7 @@
#command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, 0 )
#command SET HARDCOMMIT <x:ON,OFF,&> => Set( _SET_HARDCOMMIT, <(x)> )
#command SET HARDCOMMIT (<x>) => Set( _SET_HARDCOMMIT, <x> )
#command SET EOL <x> => Set( _SET_EOL, <x> )
#endif
#endif /* HB_STD_CH_ */