luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1115 from Vaelatern/fix-32-bit-again

Browse source 
fix builds on 32bit
This commit is contained in:
Alexander Wang 2023-03-31 21:21:19 -07:00 committed by GitHub
commit c6740734d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/release/changelogs/next.md
View file

@ -6,5 +6,6 @@
#### Bugfixes ⛑️ #### Bugfixes ⛑️
- Fix a bug in 32bit builds [#1115](https://github.com/terrastruct/d2/issues/1115)
- Fix a bug in ID parsing [#322](https://github.com/terrastruct/d2/issues/322) - Fix a bug in ID parsing [#322](https://github.com/terrastruct/d2/issues/322)
- Fix a bug in watch mode parsing SVG [#1119](https://github.com/terrastruct/d2/issues/1119) - Fix a bug in watch mode parsing SVG [#1119](https://github.com/terrastruct/d2/issues/1119)

8
lib/font/font.go
View file

@ -49,8 +49,8 @@ var (
WOFF_ENTRY_OFFSET_CHECKSUM = 16 WOFF_ENTRY_OFFSET_CHECKSUM = 16
// magic // magic
MAGIC_WOFF = 0x774f4646 MAGIC_WOFF uint32 = 0x774f4646
MAGIC_CHECKSUM_ADJUSTMENT = 0xb1b0afba MAGIC_CHECKSUM_ADJUSTMENT uint32 = 0xb1b0afba
// sizes // sizes
SIZE_OF_WOFF_HEADER = 44 SIZE_OF_WOFF_HEADER = 44
@ -85,7 +85,7 @@ func Sfnt2Woff(fontBuf []byte) ([]byte, error) {
numTables := binary.BigEndian.Uint16(fontBuf[4:]) numTables := binary.BigEndian.Uint16(fontBuf[4:])
woffHeader := make([]byte, SIZE_OF_WOFF_HEADER) woffHeader := make([]byte, SIZE_OF_WOFF_HEADER)
binary.BigEndian.PutUint32(woffHeader[WOFF_OFFSET_MAGIC:], uint32(MAGIC_WOFF)) binary.BigEndian.PutUint32(woffHeader[WOFF_OFFSET_MAGIC:], MAGIC_WOFF)
binary.BigEndian.PutUint16(woffHeader[WOFF_OFFSET_NUM_TABLES:], numTables) binary.BigEndian.PutUint16(woffHeader[WOFF_OFFSET_NUM_TABLES:], numTables)
binary.BigEndian.PutUint16(woffHeader[WOFF_OFFSET_SFNT_SIZE:], 0) binary.BigEndian.PutUint16(woffHeader[WOFF_OFFSET_SFNT_SIZE:], 0)
binary.BigEndian.PutUint32(woffHeader[WOFF_OFFSET_META_OFFSET:], 0) binary.BigEndian.PutUint32(woffHeader[WOFF_OFFSET_META_OFFSET:], 0)
@ -148,7 +148,7 @@ func Sfnt2Woff(fontBuf []byte) ([]byte, error) {
csum += tableEntry.CheckSum csum += tableEntry.CheckSum
} }
var checksumAdjustment = uint32(MAGIC_CHECKSUM_ADJUSTMENT) - csum var checksumAdjustment = MAGIC_CHECKSUM_ADJUSTMENT - csum
majorVersion := uint16(0) majorVersion := uint16(0)
minVersion := uint16(1) minVersion := uint16(1)