From 77978ac68d3808060e58df41ebede4b9f3631641 Mon Sep 17 00:00:00 2001
From: xuri <xuri.me@gmail.com>
Date: Mon, 14 Dec 2020 20:56:51 +0800
Subject: This closes #657 and closes #748, AddChart support custom marker
 symbol and symbol size, fix AddPicture auto fit failure with multi merged
 cells

---
 picture.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'picture.go')

diff --git a/picture.go b/picture.go
index 1a9cac1..77898fc 100644
--- a/picture.go
+++ b/picture.go
@@ -605,6 +605,9 @@ func (f *File) drawingResize(sheet string, cell string, width, height float64, f
 	}
 	cellWidth, cellHeight := f.getColWidth(sheet, c), f.getRowHeight(sheet, r)
 	for _, mergeCell := range mergeCells {
+		if inMergeCell {
+			continue
+		}
 		if inMergeCell, err = f.checkCellInArea(cell, mergeCell[0]); err != nil {
 			return
 		}
-- 
cgit v1.2.1