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

2012-10-23 00:56 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbgd/gdbarcod.prg
    ! fixed generating check digit 0 instead of '*' for EAN13

  * contrib/hbrun/hbrun.hbp
    ! typo in comment
This commit is contained in:
Viktor Szakats
2012-10-22 22:58:49 +00:00
parent a5c36c03de
commit a854fe84dd
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-23 00:56 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbgd/gdbarcod.prg
! fixed generating check digit 0 instead of '*' for EAN13
* contrib/hbrun/hbrun.hbp
! typo in comment
2012-10-22 23:47 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbct/tests/*.prg
! various cleanups and fixes after running them each
@@ -1725,9 +1732,8 @@
2012-10-12 11:16 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbgd/gdbarcod.prg
% AllTrim() removed from around Str( n, 1 )
* TOFIX? added to gdbarcod.prg in one place where
Str( n, 1 ) is used and the value can be 10.
; Francesco, can you look at it?
* TOFIX: added to gdbarcod.prg in one place where
Str( n, 1 ) is used and the value can be 10. [DONE]
* contrib/gtwvg/tests/dyndlgs.prg
* extras/hbxlsxml/tests/example.prg

20
harbour/contrib/hbgd/gdbarcod.prg
View File

@@ -103,7 +103,7 @@ METHOD New( nTypeCode ) CLASS TCode
::LeftHand_Odd := { "0011001", "0010011", "0111101", "0100011", "0110001", "0101111", "0111011", "0110111", "0001011", "0001101" }
::LeftHand_Even := { "0110011", "0011011", "0100001", "0011101", "0111001", "0000101", "0010001", "0001001", "0010111", "0100111" }
::Right_Hand := { "1100110", "1101100", "1000010", "1011100", "1001110", "1010000", "1000100", "1001000", "1110100", "1110010" }
::Parity := { "OOEOEE", "OOEEOE", "OOEEEO", "OEOOEE", "OEEOOE", "OEEEOO", "OEOEOE", "OEOEEO", "OEEOEO", "OOOOOO" }
::Parity := { "OOEOEE", "OOEEOE", "OOEEEO", "OEOOEE", "OEEOOE", "OEEEOO", "OEOEOE", "OEOEEO", "OEEOEO", "OOOOOO" }
::keys := { "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" }
ELSEIF nTypeCode == 128
@@ -184,7 +184,7 @@ METHOD Draw13( cText ) CLASS TCode
LOCAL ii, jj
LOCAL xParity
::Settext( ctext )
::Settext( cText )
// Valid characters
IF ! ::CheckCode()
@@ -267,24 +267,24 @@ METHOD Draw13( cText ) CLASS TCode
nChk := 10 - jj
ENDIF
cText += Str( nChk, 1 )
IF nChk == 0
nChk := 10
ENDIF
::DrawSingleBar( ::Right_Hand[ nChk ] )
// Now, finish bar
// Now, finish bar
::maxHeight := ::maxHeight + 9
::DrawSingleBar( "101" )
::lastX := ::positionX
::lastY := ::maxHeight
ctext += Str( nChk, 1 ) // TOFIX? nChk can be 10 at this point, is this intended?
// Draw Text
IF ::lDrawValue
::Settext( ctext )
::Settext( cText )
::DrawText13()
ENDIF
@@ -317,7 +317,7 @@ METHOD Draw8( cText ) CLASS TCode
LOCAL nchkSum := 0
LOCAL nChk := 0
::Settext( ctext )
::Settext( cText )
// Valid characters
IF !::CheckCode()
@@ -383,11 +383,11 @@ METHOD Draw8( cText ) CLASS TCode
::lastX := ::positionX
::lastY := ::maxHeight
ctext += Str( nChk, 1 )
cText += Str( nChk, 1 )
// Draw text
IF ::lDrawValue
::Settext( ctext )
::Settext( cText )
::DrawText8()
ENDIF
@@ -591,7 +591,7 @@ METHOD Draw128( cText, cModeCode ) CLASS TCode
// Draw Text
IF ::lDrawValue
::Settext( ctext )
::Settext( cText )
::DrawText()
ENDIF

4
harbour/contrib/hbrun/hbrun.hbp
View File

@@ -6,10 +6,10 @@
-o${hb_name}
# Build in shared mode for these platforms because the
# Build in shared mode for these platforms because
# it's required for dynamic extension loading. (only
# do that if HB_BUILD_CONTRIB_DYN is enabled, so there
# are actually some dynamic extensions to load.)
# are actual dynamic extensions to load.)
{_HB_BUILD_&(!(HB_BUILD_DYN='no')&!(HB_BUILD_CONTRIB_DYN='no')&(win|wce|os2))}-shared
-DHBMK_WITH_ALL_EMBEDDED_HEADERS