Skip to content

Commit 11c8f66

Browse files
gunnsthgunnsth
committed
Change logging to logrus
1 parent 3717928 commit 11c8f66

24 files changed

+186
-195
lines changed

Diff for: ‎byte_writer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"fmt"
1212
"io"
1313

14-
"github.com/unidoc/unipdf/v3/common"
14+
"github.com/sirupsen/logrus"
1515
)
1616

1717
// byteWriter encapsulates io.Writer and provides methods to write binary data as fit for truetype fonts.
@@ -54,9 +54,9 @@ func (w *byteWriter) checksum() uint32 {
5454
data := w.buffer.Bytes()
5555

5656
if len(data) < 60 {
57-
common.Log.Debug("Data: % X", data)
57+
logrus.Debugf("Data: % X", data)
5858
}
59-
common.Log.Debug("Data length: %d", len(data))
59+
logrus.Debugf("Data length: %d", len(data))
6060
sum = 0
6161

6262
for i := 0; i < len(data); i += 4 {

Diff for: ‎encoding.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"encoding/binary"
1010
"unicode/utf8"
1111

12-
"github.com/unidoc/unipdf/v3/common"
12+
"github.com/sirupsen/logrus"
1313

1414
"golang.org/x/text/encoding"
1515
"golang.org/x/text/encoding/charmap"
@@ -99,7 +99,7 @@ func getCmapEncoding(platformID, encodingID int) cmapEncoding {
9999
return cmapEncodingUCS4
100100
}
101101
}
102-
common.Log.Debug("Unsupported: PlatformID=%d, EncodingID=%d", platformID, encodingID)
102+
logrus.Debugf("Unsupported: PlatformID=%d, EncodingID=%d", platformID, encodingID)
103103

104104
return cmapEncodingUnsupported
105105
}
@@ -148,7 +148,7 @@ func (e cmapEncoding) GetRuneDecoder() runeDecoder {
148148
}
149149

150150
if d == nil {
151-
common.Log.Debug("ERROR: Unsupported encoding (%d) - returning charcodes as runes", e)
151+
logrus.Debugf("ERROR: Unsupported encoding (%d) - returning charcodes as runes", e)
152152
d = unicode.UTF8.NewDecoder()
153153
charcodeBytes = 1
154154
}
@@ -177,7 +177,7 @@ func (d runeDecoder) ToBytes(charcode uint32) []byte {
177177
case 4:
178178
binary.BigEndian.PutUint32(b, charcode)
179179
default:
180-
common.Log.Debug("ERROR: Unsupported number of bytes per charcode: %d", d.charcodeBytes)
180+
logrus.Debugf("ERROR: Unsupported number of bytes per charcode: %d", d.charcodeBytes)
181181
return []byte{0}
182182
}
183183

@@ -189,7 +189,7 @@ func (d runeDecoder) DecodeRune(b []byte) rune {
189189
// Get decoded bytes (the decoder decodes to UTF8 byte format).
190190
decoded, err := d.Bytes(b)
191191
if err != nil {
192-
common.Log.Debug("Decoding error: %v", err)
192+
logrus.Debugf("Decoding error: %v", err)
193193
}
194194

195195
// TODO(gunnsth): Benchmark utf8.DecodeRune vs string().

Diff for: ‎font.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"fmt"
1212
"io"
1313

14-
"github.com/unidoc/unipdf/v3/common"
14+
"github.com/sirupsen/logrus"
1515
)
1616

1717
// TODO: Export only what unipdf needs:
@@ -188,7 +188,7 @@ func (f *font) write(w *byteWriter) error {
188188
// Or a combined fixed size buffer with partial file system use.
189189
// Best if such implementation is hidden within a well tested package.
190190

191-
common.Log.Debug("Write 1")
191+
logrus.Debug("Write 1")
192192
numTables := f.numTablesToWrite()
193193
otTable := &offsetTable{
194194
sfntVersion: f.ot.sfntVersion,
@@ -206,7 +206,7 @@ func (f *font) write(w *byteWriter) error {
206206

207207
fmt.Printf("==== write\nnumTables: %d\nstartOffset: %d\n", numTables, startOffset)
208208

209-
common.Log.Debug("Write 2")
209+
logrus.Debug("Write 2")
210210
// Writing is two phases and is done in a few steps:
211211
// 1. Write the content tables: head, hhea, etc in the expected order and keep track of the length, checksum for each.
212212
// 2. Generate the table records based on the information.
@@ -358,7 +358,7 @@ func (f *font) write(w *byteWriter) error {
358358
}
359359
}
360360
}
361-
common.Log.Debug("Write 3")
361+
logrus.Debug("Write 3")
362362

363363
// Write the offset and table records to another mock buffer.
364364
var bufh bytes.Buffer

Diff for: ‎font_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ package unitype
33
import (
44
"testing"
55

6+
"github.com/sirupsen/logrus"
67
"github.com/stretchr/testify/require"
7-
8-
"github.com/unidoc/unipdf/v3/common"
98
)
109

1110
func TestReadWrite(t *testing.T) {
12-
//common.SetLogger(common.NewConsoleLogger(common.LogLevelDebug))
13-
1411
testcases := []struct {
1512
fontPath string
1613
}{
@@ -32,8 +29,7 @@ func TestReadWrite(t *testing.T) {
3229
fnt, err := ParseFile(tcase.fontPath)
3330
require.NoError(t, err)
3431

35-
common.Log.Debug("Write")
36-
32+
logrus.Debug("Write")
3733
outPath := "/tmp/1.ttf"
3834

3935
t.Logf("WriteFile -> %s", outPath)

Diff for: ‎go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
module github.com/gunnsth/unitype
22

33
require (
4-
github.com/davecgh/go-spew v1.1.1
4+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
5+
github.com/sirupsen/logrus v1.5.0
56
github.com/spf13/cobra v0.0.6
67
github.com/stretchr/testify v1.4.0
7-
github.com/unidoc/unipdf/v3 v3.4.0
8+
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
89
golang.org/x/text v0.3.2
910
)
1011

Diff for: ‎go.sum

+13-17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
66
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
77
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
88
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
9-
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
109
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
1110
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
1211
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -40,18 +39,22 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
4039
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
4140
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
4241
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
43-
github.com/gunnsth/pkcs7 v0.0.0-20181213175627-3cffc6fbfe83 h1:saj5dTV7eQ1wFg/gVZr1SfbkOmg8CYO9R8frHgQiyR4=
44-
github.com/gunnsth/pkcs7 v0.0.0-20181213175627-3cffc6fbfe83/go.mod h1:xaGEIRenAiJcGgd9p62zbiP4993KaV3PdjczwGnP50I=
4542
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
43+
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
4644
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
4745
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
4846
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
4947
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
5048
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
49+
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
5150
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
51+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
52+
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
5253
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
54+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
5355
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
5456
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
57+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
5558
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
5659
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
5760
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -75,7 +78,10 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
7578
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
7679
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
7780
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
81+
github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
7882
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
83+
github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
84+
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
7985
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
8086
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
8187
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -89,13 +95,10 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y
8995
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
9096
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
9197
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
92-
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
9398
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
9499
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
95100
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
96101
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
97-
github.com/unidoc/unipdf/v3 v3.4.0 h1:CO9cb3XV79QyvBTEdrRHbOVjZc6c5xCX/EJP4B109xw=
98-
github.com/unidoc/unipdf/v3 v3.4.0/go.mod h1:deHLROTLv9UDHIcWQFbjcrEZ4aTwyhPXX0fvpyoZyAM=
99102
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
100103
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
101104
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -104,32 +107,25 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
104107
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
105108
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
106109
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
107-
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5 h1:58fnuSXlxZmFdJyvtTFVmVhcMLU6v5fEb/ok4wyqtNU=
108-
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
109-
golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b h1:VHyIDlv3XkfCa5/a81uzaoDkHH4rr81Z62g+xlnO8uM=
110-
golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
111110
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
112111
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
113-
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
114112
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
115113
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
116114
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
117115
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
118-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
119116
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
120-
golang.org/x/net v0.0.0-20190606173856-1492cefac77f/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
121117
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
122118
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
123119
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
124120
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
125-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
126121
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
127122
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
128123
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
129124
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
130125
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
131-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
132-
golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
126+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
127+
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
128+
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
133129
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
134130
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
135131
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -138,14 +134,14 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
138134
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
139135
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
140136
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
141-
golang.org/x/tools v0.0.0-20190606174628-0139d5756a7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
142137
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
143138
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
144139
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
145140
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
146141
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
147142
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
148143
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
144+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
149145
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
150146
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
151147
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

Diff for: ‎internal/strutils/encoding.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"bytes"
1111
"unicode/utf16"
1212

13-
"github.com/unidoc/unipdf/v3/common"
13+
"github.com/sirupsen/logrus"
1414
)
1515

1616
var pdfdocEncodingRuneMap map[rune]byte
@@ -29,7 +29,7 @@ func UTF16ToRunes(b []byte) []rune {
2929
}
3030
if len(b)%2 != 0 {
3131
b = append(b, 0)
32-
common.Log.Debug("ERROR: UTF16ToRunes. Padding with zeros.")
32+
logrus.Debug("ERROR: UTF16ToRunes. Padding with zeros.")
3333
}
3434
n := len(b) >> 1
3535
chars := make([]uint16, n)
@@ -64,7 +64,7 @@ func PDFDocEncodingToRunes(b []byte) []rune {
6464
for _, bval := range b {
6565
rune, has := pdfDocEncoding[bval]
6666
if !has {
67-
common.Log.Debug("Error: PDFDocEncoding input mapping error %d - skipping", bval)
67+
logrus.Debugf("Error: PDFDocEncoding input mapping error %d - skipping", bval)
6868
continue
6969
}
7070

@@ -85,7 +85,7 @@ func StringToPDFDocEncoding(s string) []byte {
8585
for _, r := range s {
8686
b, has := pdfdocEncodingRuneMap[r]
8787
if !has {
88-
common.Log.Debug("ERROR: PDFDocEncoding rune mapping missing %c/%X - skipping", r, r)
88+
logrus.Debugf("ERROR: PDFDocEncoding rune mapping missing %c/%X - skipping", r, r)
8989
continue
9090
}
9191
buf.WriteByte(b)

Diff for: ‎table_cmap.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"errors"
1111
"fmt"
1212

13-
"github.com/unidoc/unipdf/v3/common"
13+
"github.com/sirupsen/logrus"
1414
)
1515

1616
// cmapTable represents a Character to Glyph Index Mapping Table (cmap).
@@ -37,7 +37,7 @@ type encodingRecord struct {
3737

3838
func (f *font) parseCmap(r *byteReader) (*cmapTable, error) {
3939
if f.maxp == nil {
40-
common.Log.Debug("Unable to load cmap: maxp table is nil")
40+
logrus.Debug("Unable to load cmap: maxp table is nil")
4141
return nil, errRequiredField
4242
}
4343

@@ -46,7 +46,7 @@ func (f *font) parseCmap(r *byteReader) (*cmapTable, error) {
4646
return nil, err
4747
}
4848
if !has {
49-
common.Log.Debug("cmap table absent")
49+
logrus.Debug("cmap table absent")
5050
return nil, nil
5151
}
5252

@@ -93,11 +93,11 @@ func (f *font) parseCmap(r *byteReader) (*cmapTable, error) {
9393
case 12:
9494
cmap, err = f.parseCmapSubtableFormat12(r, int(enc.platformID), int(enc.encodingID))
9595
default:
96-
common.Log.Debug("Unsupported cmap format %d", format)
96+
logrus.Debugf("Unsupported cmap format %d", format)
9797
continue
9898
}
9999
if err != nil {
100-
common.Log.Debug("Error: %v", err)
100+
logrus.Debugf("Error: %v", err)
101101
return nil, err
102102
}
103103
if cmap != nil {
@@ -322,7 +322,7 @@ func (f *font) parseCmapSubtableFormat4(r *byteReader, platformID, encodingID in
322322
b := runeDecoder.ToBytes(uint32(c))
323323
r := runeDecoder.DecodeRune(b)
324324
if int(gid) >= int(f.maxp.numGlyphs) {
325-
common.Log.Debug("ERROR: gid > numGlyphs (%d > %d)", gid, f.maxp.numGlyphs)
325+
logrus.Debugf("ERROR: gid > numGlyphs (%d > %d)", gid, f.maxp.numGlyphs)
326326
return nil, errors.New("gid out of range")
327327
}
328328
runes[int(gid)] = r
@@ -469,15 +469,15 @@ func (f *font) parseCmapSubtableFormat12(r *byteReader, platformID, encodingID i
469469
st := cmapSubtableFormat12{}
470470
err := r.read(&st.reserved, &st.length, &st.language, &st.numGroups)
471471
if err != nil {
472-
common.Log.Debug("Error: %v", err)
472+
logrus.Debugf("Error: %v", err)
473473
return nil, err
474474
}
475475

476476
for i := 0; i < int(st.numGroups); i++ {
477477
var group sequentialMapGroup
478478
err = r.read(&group.startCharCode, &group.endCharCode, &group.startGlyphID)
479479
if err != nil {
480-
common.Log.Debug("Error: %v", err)
480+
logrus.Debugf("Error: %v", err)
481481
return nil, err
482482
}
483483
st.groups = append(st.groups, group)
@@ -492,8 +492,8 @@ func (f *font) parseCmapSubtableFormat12(r *byteReader, platformID, encodingID i
492492
//fmt.Printf("XXX Parse, startCharcode: %d, endCharCode: %d, startGlyphID: %d\n", group.startCharCode, group.endCharCode, group.startGlyphID)
493493
gid := GlyphIndex(group.startGlyphID)
494494
if int(gid) >= int(f.maxp.numGlyphs) {
495-
common.Log.Debug("gid >= numGlyphs (%d > %d)", gid, f.maxp.numGlyphs)
496-
common.Log.Debug("Error: %v", errRangeCheck)
495+
logrus.Debugf("gid >= numGlyphs (%d > %d)", gid, f.maxp.numGlyphs)
496+
logrus.Debugf("Error: %v", errRangeCheck)
497497
return nil, errRangeCheck
498498
}
499499
for charcode := group.startCharCode; charcode <= group.endCharCode; charcode++ {

0 commit comments

Comments
 (0)