From db3379db21df265a2260d01beaec20602e1f40a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Thu, 30 Jan 2025 03:56:27 +0100 Subject: [PATCH] 2025-01-30 03:56 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbzebra/datamtrx.c * contrib/sddoci/core.c * reverted modifications committed by mistake --- ChangeLog.txt | 5 +++++ contrib/hbzebra/datamtrx.c | 2 -- contrib/sddoci/core.c | 6 ------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 2235a89135..a700aca61a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2025-01-30 03:56 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbzebra/datamtrx.c + * contrib/sddoci/core.c + * reverted modifications committed by mistake + 2025-01-30 03:51 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/hvm.c * changed returned type of hb_vmCalcIntWidth() to avoid casting diff --git a/contrib/hbzebra/datamtrx.c b/contrib/hbzebra/datamtrx.c index 7af6a5417d..c06a6cafce 100644 --- a/contrib/hbzebra/datamtrx.c +++ b/contrib/hbzebra/datamtrx.c @@ -329,8 +329,6 @@ static void _datamatrix_do_placement( PHB_BITBUFFER pBits, unsigned char * pCW, /* Calculate placement size without L-patterns and clock tracks */ iPRow = pSize->iRow - 2 * ( pSize->iRow / pSize->iRegionRow ); iPCol = pSize->iCol - 2 * ( pSize->iCol / pSize->iRegionCol ); - if( iPCol < 0 ) - iPCol = 0; pArr = ( int * ) hb_xgrab( sizeof( int ) * iPCol * iPRow ); hb_xmemset( pArr, 0, sizeof( int ) * iPCol * iPRow ); diff --git a/contrib/sddoci/core.c b/contrib/sddoci/core.c index dd8bf63979..89d1a3f29f 100644 --- a/contrib/sddoci/core.c +++ b/contrib/sddoci/core.c @@ -80,9 +80,6 @@ #define D_HB_ITEMPUTSTR( itm, str ) hb_itemPutStrU16( itm, HB_CDP_ENDIAN_NATIVE, str ) #define D_HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLenU16( itm, HB_CDP_ENDIAN_NATIVE, str, len ) #define D_HB_CHAR HB_WCHAR - #ifndef ostrlen - #define ostrlen wcslen - #endif #else #define D_HB_ARRAYGETSTR( arr, n, phstr, plen ) hb_arrayGetStr( arr, n, hb_setGetOSCP(), phstr, plen ) #define D_HB_ITEMCOPYSTR( itm, str, len ) hb_itemCopyStr( itm, hb_setGetOSCP(), str, len ) @@ -90,9 +87,6 @@ #define D_HB_ITEMPUTSTR( itm, str ) hb_itemPutStr( itm, hb_setGetOSCP(), str ) #define D_HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLen( itm, hb_setGetOSCP(), str, len ) #define D_HB_CHAR char - #ifndef ostrlen - #define ostrlen strlen - #endif #endif