crunchy-rocks/draw2d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix GraphicContext.DrawImage and use PNG as default format

Browse source
This commit is contained in:
Stani 2015-06-27 17:46:03 +02:00
parent 66b0d91546
commit 7ffd99f6bd
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pdf2d/graphiccontext.go
View file

@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"image" "image"
"image/color" "image/color"
"image/jpeg" "image/png"
"log" "log"
"os" "os"
"strconv" "strconv"
@ -70,17 +70,20 @@ func NewGraphicContext(pdf *gofpdf.Fpdf) *GraphicContext {
return &GraphicContext{draw2d.NewStackGraphicContext(), pdf, dpi} return &GraphicContext{draw2d.NewStackGraphicContext(), pdf, dpi}
} }
// DrawImage draws an image as JPG at 96dpi // DrawImage draws an image as PNG
// TODO: add type (tp) as parameter to argument list?
func (gc *GraphicContext) DrawImage(image image.Image) { func (gc *GraphicContext) DrawImage(image image.Image) {
name := strconv.Itoa(int(imageCount)) name := strconv.Itoa(int(imageCount))
tp := "JPG" // "JPG", "JPEG", "PNG" and "GIF" tp := "PNG" // "JPG", "JPEG", "PNG" and "GIF"
b := &bytes.Buffer{} b := &bytes.Buffer{}
jpeg.Encode(b, image, nil) png.Encode(b, image)
gc.pdf.RegisterImageReader(name, tp, b) gc.pdf.RegisterImageReader(name, tp, b)
gc.pdf.Image(name, 0, 0, 0, 0, false, tp, 0, "") bounds := image.Bounds()
// bounds := image.Bounds() //x0, y0, x1, y1 := float64(bounds.Min.X), float64(bounds.Min.Y), float64(bounds.Dx()), float64(bounds.Dy())
// x, y, w, h := float64(bounds.Min.X), float64(bounds.Min.Y), float64(bounds.Dx()), float64(bounds.Dy()) x0, y0, x1, y1 := float64(bounds.Min.X), float64(bounds.Min.Y), float64(bounds.Max.X), float64(bounds.Max.Y)
//gc.pdf.Image(name, x, y, w, h, false, tp, 0, "") tr := gc.Current.Tr
tr.TransformRectangle(&x0, &y0, &x1, &y1)
gc.pdf.Image(name, x0, y0, x1-x0, y1-y0, false, tp, 0, "")
} }
// Clear draws a white rectangle over the whole page // Clear draws a white rectangle over the whole page