From 677a22d99497fcc24135c949ab721d80ba5aa92a Mon Sep 17 00:00:00 2001 From: xuri Date: Fri, 22 Mar 2019 14:26:43 +0800 Subject: [PATCH] resolve #366 fix image duplication --- picture.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/picture.go b/picture.go index cacc453..d78bcdf 100644 --- a/picture.go +++ b/picture.go @@ -250,13 +250,21 @@ func (f *File) addSheetPicture(sheet string, rID int) { // countDrawings provides a function to get drawing files count storage in the // folder xl/drawings. func (f *File) countDrawings() int { - count := 0 + c1, c2 := 0, 0 for k := range f.XLSX { if strings.Contains(k, "xl/drawings/drawing") { - count++ + c1++ } } - return count + for rel := range f.Drawings { + if strings.Contains(rel, "xl/drawings/drawing") { + c2++ + } + } + if c1 < c2 { + return c2 + } + return c1 } // addDrawingPicture provides a function to add picture by given sheet,