From ad883caa0f77dfc016ae99bd5fbb606953eb99a0 Mon Sep 17 00:00:00 2001 From: xuri Date: Wed, 19 Feb 2020 00:08:10 +0800 Subject: Resolve #580, revert commit https://github.com/360EntSecGroup-Skylar/excelize/commit/5ca7231ed408ac264f509ff52b5d28ff4fbda757 --- picture.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'picture.go') diff --git a/picture.go b/picture.go index 0b91b91..3e24ce3 100644 --- a/picture.go +++ b/picture.go @@ -59,18 +59,18 @@ func parseFormatPictureSet(formatSet string) (*formatPicture, error) { // f := excelize.NewFile() // // Insert a picture. // if err := f.AddPicture("Sheet1", "A2", "image.jpg", ""); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // // Insert a picture scaling in the cell with location hyperlink. // if err := f.AddPicture("Sheet1", "D2", "image.png", `{"x_scale": 0.5, "y_scale": 0.5, "hyperlink": "#Sheet2!D8", "hyperlink_type": "Location"}`); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // // Insert a picture offset in the cell with external hyperlink, printing and positioning support. // if err := f.AddPicture("Sheet1", "H2", "image.gif", `{"x_offset": 15, "y_offset": 10, "hyperlink": "https://github.com/360EntSecGroup-Skylar/excelize", "hyperlink_type": "External", "print_obj": true, "lock_aspect_ratio": false, "locked": false, "positioning": "oneCell"}`); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // if err := f.SaveAs("Book1.xlsx"); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // } // @@ -104,6 +104,7 @@ func (f *File) AddPicture(sheet, cell, picture, format string) error { // package main // // import ( +// "fmt" // _ "image/jpeg" // "io/ioutil" // @@ -115,13 +116,13 @@ func (f *File) AddPicture(sheet, cell, picture, format string) error { // // file, err := ioutil.ReadFile("image.jpg") // if err != nil { -// println(err.Error()) +// fmt.Println(err) // } // if err := f.AddPictureFromBytes("Sheet1", "A2", "", "Excel Logo", ".jpg", file); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // if err := f.SaveAs("Book1.xlsx"); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // } // @@ -424,16 +425,16 @@ func (f *File) getSheetRelationshipsTargetByID(sheet, rID string) string { // // f, err := excelize.OpenFile("Book1.xlsx") // if err != nil { -// println(err.Error()) +// fmt.Println(err) // return // } // file, raw, err := f.GetPicture("Sheet1", "A2") // if err != nil { -// println(err.Error()) +// fmt.Println(err) // return // } // if err := ioutil.WriteFile(file, raw, 0644); err != nil { -// println(err.Error()) +// fmt.Println(err) // } // func (f *File) GetPicture(sheet, cell string) (string, []byte, error) { -- cgit v1.2.1