mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-08-30 12:12:40 +08:00
+3
-3
@@ -21,7 +21,7 @@ import (
|
|||||||
"image"
|
"image"
|
||||||
"image/color"
|
"image/color"
|
||||||
|
|
||||||
canvas_image "github.com/tdewolff/canvas/image"
|
canvasimage "github.com/tdewolff/canvas/image"
|
||||||
_ "github.com/xiaoqidun/jbig2"
|
_ "github.com/xiaoqidun/jbig2"
|
||||||
_ "golang.org/x/image/bmp"
|
_ "golang.org/x/image/bmp"
|
||||||
)
|
)
|
||||||
@@ -33,11 +33,11 @@ func decodeImageData(data []byte) (image.Image, string, error) {
|
|||||||
if _, format, err := image.DecodeConfig(bytes.NewReader(data)); err == nil {
|
if _, format, err := image.DecodeConfig(bytes.NewReader(data)); err == nil {
|
||||||
switch format {
|
switch format {
|
||||||
case "jpeg":
|
case "jpeg":
|
||||||
if img, err := canvas_image.NewJPEGImage(bytes.NewReader(data)); err == nil {
|
if img, err := canvasimage.NewJPEGImage(bytes.NewReader(data)); err == nil {
|
||||||
return img, format, nil
|
return img, format, nil
|
||||||
}
|
}
|
||||||
case "png":
|
case "png":
|
||||||
if img, err := canvas_image.NewPNGImage(bytes.NewReader(data)); err == nil {
|
if img, err := canvasimage.NewPNGImage(bytes.NewReader(data)); err == nil {
|
||||||
return img, format, nil
|
return img, format, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import (
|
|||||||
"image/color"
|
"image/color"
|
||||||
|
|
||||||
"github.com/tdewolff/canvas"
|
"github.com/tdewolff/canvas"
|
||||||
canvas_image "github.com/tdewolff/canvas/image"
|
canvasimage "github.com/tdewolff/canvas/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
// renderImage 渲染图片
|
// renderImage 渲染图片
|
||||||
@@ -113,7 +113,7 @@ func imageWithTransparentEdge(img image.Image) (image.Image, int) {
|
|||||||
if w == 0 || h == 0 {
|
if w == 0 || h == 0 {
|
||||||
return img, 0
|
return img, 0
|
||||||
}
|
}
|
||||||
if src, ok := img.(*canvas_image.Image); ok && src.Mimetype == "image/jpeg" && src.Mask == nil {
|
if src, ok := img.(*canvasimage.Image); ok && src.Mimetype == "image/jpeg" && src.Mask == nil {
|
||||||
return img, 0
|
return img, 0
|
||||||
}
|
}
|
||||||
if opaque, ok := img.(interface{ Opaque() bool }); ok && opaque.Opaque() {
|
if opaque, ok := img.(interface{ Opaque() bool }); ok && opaque.Opaque() {
|
||||||
|
|||||||
Reference in New Issue
Block a user