OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-04-27 13:48:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary argument

Browse Source
This commit is contained in:
Hiroshi Muramatsu 2018-07-11 09:04:17 +10:00
parent 3df8e373db
commit 299f65df69
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pdf/model/font.go
View File

@ -96,7 +96,7 @@ func newPdfFontFromPdfObject(fontObj PdfObject, allowType0 bool) (*PdfFont, erro
common.Log.Debug("ERROR: Loading type0 not allowed. font=%s", font)
return nil, errors.New("Cyclical type0 loading")
}
type0font, err := newPdfFontType0FromPdfObject(fontObj, skeleton)
type0font, err := newPdfFontType0FromPdfObject(skeleton)
if err != nil {
common.Log.Debug("ERROR: While loading Type0 font. font=%s err=%v", font, err)
return nil, err
@ -112,13 +112,13 @@ func newPdfFontFromPdfObject(fontObj PdfObject, allowType0 bool) (*PdfFont, erro
common.Log.Debug("ERROR: Bad Standard14\n\tfont=%s\n\tstd=%+v", font, std)
return nil, err
}
simplefont, err = newSimpleFontFromPdfObject(stdObj, stdSkeleton, true)
simplefont, err = newSimpleFontFromPdfObject(stdSkeleton, true)
if err != nil {
common.Log.Debug("ERROR: Bad Standard14\n\tfont=%s\n\tstd=%+v", font, std)
return nil, err
}
} else {
simplefont, err = newSimpleFontFromPdfObject(fontObj, skeleton, false)
simplefont, err = newSimpleFontFromPdfObject(skeleton, false)
if err != nil {
common.Log.Debug("ERROR: While loading simple font: font=%s err=%v", font, err)
return nil, err
@ -130,14 +130,14 @@ func newPdfFontFromPdfObject(fontObj PdfObject, allowType0 bool) (*PdfFont, erro
}
font.context = simplefont
case "CIDFontType0":
cidfont, err := newPdfCIDFontType0FromPdfObject(fontObj, skeleton)
cidfont, err := newPdfCIDFontType0FromPdfObject(skeleton)
if err != nil {
common.Log.Debug("ERROR: While loading cid font type0 font: %v", err)
return nil, err
}
font.context = cidfont
case "CIDFontType2":
cidfont, err := newPdfCIDFontType2FromPdfObject(fontObj, skeleton)
cidfont, err := newPdfCIDFontType2FromPdfObject(skeleton)
if err != nil {
common.Log.Debug("ERROR: While loading cid font type2 font. font=%s err=%v", font, err)
return nil, err

16
pdf/model/font_composite.go
View File

@ -133,16 +133,16 @@ func (font *pdfFontType0) ToPdfObject() PdfObject {
return font.container
}
// newPdfFontType0FromPdfObject makes a pdfFontType0 based on the input PdfObject which should be
// represented by a dictionary. If a problem is encountered, an error is returned.
func newPdfFontType0FromPdfObject(obj PdfObject, skeleton *fontSkeleton) (*pdfFontType0, error) {
// newPdfFontType0FromPdfObject makes a pdfFontType0 based on the input `d` in skeleton.
// If a problem is encountered, an error is returned.
func newPdfFontType0FromPdfObject(skeleton *fontSkeleton) (*pdfFontType0, error) {
d := skeleton.dict
// DescendantFonts.
arr, err := GetArray(TraceToDirectObject(d.Get("DescendantFonts")))
if err != nil {
common.Log.Debug("ERROR: Invalid DescendantFonts - not an array (%T) %s", obj, skeleton)
common.Log.Debug("ERROR: Invalid DescendantFonts - not an array %s", skeleton)
return nil, ErrRangeError
}
if len(arr) != 1 {
@ -208,7 +208,7 @@ func (font *pdfCIDFontType0) ToPdfObject() PdfObject {
// newPdfCIDFontType0FromPdfObject creates a pdfCIDFontType0 object from a dictionary (either direct
// or via indirect object). If a problem occurs with loading an error is returned.
// XXX: This is a stub.
func newPdfCIDFontType0FromPdfObject(obj PdfObject, skeleton *fontSkeleton) (*pdfCIDFontType0, error) {
func newPdfCIDFontType0FromPdfObject(skeleton *fontSkeleton) (*pdfCIDFontType0, error) {
if skeleton.subtype != "CIDFontType0" {
common.Log.Debug("ERROR: Font SubType != CIDFontType0. font=%s", skeleton)
return nil, ErrRangeError
@ -218,7 +218,7 @@ func newPdfCIDFontType0FromPdfObject(obj PdfObject, skeleton *fontSkeleton) (*pd
d := skeleton.dict
// CIDSystemInfo.
obj = TraceToDirectObject(d.Get("CIDSystemInfo"))
obj := TraceToDirectObject(d.Get("CIDSystemInfo"))
if obj == nil {
common.Log.Debug("ERROR: CIDSystemInfo (Required) missing. font=%s", skeleton)
return nil, ErrRequiredAttributeMissing
@ -316,7 +316,7 @@ func (font *pdfCIDFontType2) ToPdfObject() PdfObject {
// newPdfCIDFontType2FromPdfObject creates a pdfCIDFontType2 object from a dictionary (either direct
// or via indirect object). If a problem occurs with loading an error is returned.
func newPdfCIDFontType2FromPdfObject(obj PdfObject, skeleton *fontSkeleton) (*pdfCIDFontType2, error) {
func newPdfCIDFontType2FromPdfObject(skeleton *fontSkeleton) (*pdfCIDFontType2, error) {
if skeleton.subtype != "CIDFontType2" {
common.Log.Debug("ERROR: Font SubType != CIDFontType2. font=%s", skeleton)
return nil, ErrRangeError
@ -326,7 +326,7 @@ func newPdfCIDFontType2FromPdfObject(obj PdfObject, skeleton *fontSkeleton) (*pd
d := skeleton.dict
// CIDSystemInfo.
obj = d.Get("CIDSystemInfo")
obj := d.Get("CIDSystemInfo")
if obj == nil {
common.Log.Debug("ERROR: CIDSystemInfo (Required) missing. font=%s", skeleton)
return nil, ErrRequiredAttributeMissing

4
pdf/model/font_simple.go
View File

@ -96,14 +96,14 @@ func (font pdfFontSimple) GetGlyphCharMetrics(glyph string) (fonts.CharMetrics,
//
// !@#$ 9.6.6.4 Encodings for TrueType Fonts (page 265)
// Need to get TrueType font's cmap
func newSimpleFontFromPdfObject(obj PdfObject, skeleton *fontSkeleton, std14 bool) (*pdfFontSimple, error) {
func newSimpleFontFromPdfObject(skeleton *fontSkeleton, std14 bool) (*pdfFontSimple, error) {
font := &pdfFontSimple{fontSkeleton: skeleton}
d := skeleton.dict
// !@#$ Failing on ~/testdata/The-Byzantine-Generals-Problem.pdf
if !std14 {
obj = d.Get("FirstChar")
obj := d.Get("FirstChar")
if obj == nil {
// See /Users/pcadmin/testdata/shamirturing.pdf
if skeleton.subtype == "TrueType" {