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

document: fix non-PNG image support

Browse Source 
Fixes #188
This commit is contained in:
Todd 2018-07-08 17:26:24 -05:00
parent a78d579d58
commit 7f7bedb858
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
document/document.go
View File

@ -16,6 +16,7 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
"strings"
"baliance.com/gooxml" "baliance.com/gooxml"
"baliance.com/gooxml/common" "baliance.com/gooxml/common"
@ -233,7 +234,7 @@ func (d *Document) Save(w io.Writer) error {
} }
for i, img := range d.Images { for i, img := range d.Images {
fn := fmt.Sprintf("word/media/image%d.png", i+1) fn := fmt.Sprintf("word/media/image%d.%s", i+1, strings.ToLower(img.Format()))
if img.Path() != "" { if img.Path() != "" {
if err := zippkg.AddFileFromDisk(z, fn, img.Path()); err != nil { if err := zippkg.AddFileFromDisk(z, fn, img.Path()); err != nil {
return err return err

2
presentation/presentation.go
View File

@ -19,6 +19,7 @@ import (
"log" "log"
"os" "os"
"path" "path"
"strings"
"baliance.com/gooxml" "baliance.com/gooxml"
"baliance.com/gooxml/common" "baliance.com/gooxml/common"
@ -440,6 +441,7 @@ func (p *Presentation) Save(w io.Writer) error {
for i, img := range p.Images { for i, img := range p.Images {
fn := gooxml.AbsoluteFilename(gooxml.DocTypePresentation, gooxml.ImageType, i+1) fn := gooxml.AbsoluteFilename(gooxml.DocTypePresentation, gooxml.ImageType, i+1)
fn = fn[0:len(fn)-3] + strings.ToLower(img.Format())
if img.Path() != "" { if img.Path() != "" {
if err := zippkg.AddFileFromDisk(z, fn, img.Path()); err != nil { if err := zippkg.AddFileFromDisk(z, fn, img.Path()); err != nil {
return err return err