15327829984

Committed 29 May 2025 03:46PM UTC coverage: 92.318% (-0.09%) from 92.412%

Build # 15327829984

Build Type

Pull #550

github

Committed by

cshum

Commit Message

WithForceBmpFallback WithForceBufferFallback

Pull Request Pull Request #550: feat: fallback with BMP or Buffer on Magick installation

Run Details

56 of 75 new or added lines in 3 files covered. (74.67%)

1 existing line in 1 file now uncovered.

4879 of 5285 relevant lines covered (92.32%)

1.11 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.7

/processor/vipsprocessor/fallback.go

package vipsprocessor

import (
        "github.com/cshum/imagor"
        "github.com/cshum/vipsgen/vips"
        "golang.org/x/image/bmp"
        "image"
        "image/draw"
        "io"
)

// FallbackFunc vips.Image fallback handler when vips.NewImageFromSource failed
type FallbackFunc func(blob *imagor.Blob, options *vips.LoadOptions) (*vips.Image, error)

// BufferFallbackFunc load image from buffer FallbackFunc
func BufferFallbackFunc(blob *imagor.Blob, options *vips.LoadOptions) (*vips.Image, error) {
        buf, err := blob.ReadAll()
        if err != nil {
                return nil, err
        }
        return vips.NewImageFromBuffer(buf, options)
}

func loadImageFromBMP(r io.Reader) (*vips.Image, error) {
        img, err := bmp.Decode(r)
        if err != nil {
                return nil, err
        }
        rect := img.Bounds()
        size := rect.Size()
        rgba, ok := img.(*image.RGBA)
        if !ok {
                rgba = image.NewRGBA(rect)
                draw.Draw(rgba, rect, img, rect.Min, draw.Src)
        }
        return vips.NewImageFromMemory(rgba.Pix, size.X, size.Y, 4)
}

func BmpFallbackFunc(blob *imagor.Blob, _ *vips.LoadOptions) (*vips.Image, error) {
        if blob.BlobType() == imagor.BlobTypeBMP {
                // fallback with Go BMP decoder if vips error on BMP
                r, _, err := blob.NewReader()
                if err != nil {
                        return nil, err
                }
                defer func() {
                        _ = r.Close()
                }()
                return loadImageFromBMP(r)
        } else {
                return nil, imagor.ErrUnsupportedFormat
        }
}

1	package vipsprocessor
2
3	import (
4	"github.com/cshum/imagor"
5	"github.com/cshum/vipsgen/vips"
6	"golang.org/x/image/bmp"
7	"image"
8	"image/draw"
9	"io"
10	)
11
12	// FallbackFunc vips.Image fallback handler when vips.NewImageFromSource failed
13	type FallbackFunc func(blob imagor.Blob, options vips.LoadOptions) (*vips.Image, error)
14
15	// BufferFallbackFunc load image from buffer FallbackFunc
NEW 16	func BufferFallbackFunc(blob imagor.Blob, options vips.LoadOptions) (*vips.Image, error) {	×
NEW 17	buf, err := blob.ReadAll()	×
NEW 18	if err != nil {	×
NEW 19	return nil, err	×
NEW 20	}	×
NEW 21	return vips.NewImageFromBuffer(buf, options)	×
22	}
23
24	func loadImageFromBMP(r io.Reader) (*vips.Image, error) {	1✔
25	img, err := bmp.Decode(r)	1✔
26	if err != nil {	1✔
NEW 27	return nil, err	×
NEW 28	}	×
29	rect := img.Bounds()	1✔
30	size := rect.Size()	1✔
31	rgba, ok := img.(*image.RGBA)	1✔
32	if !ok {	2✔
33	rgba = image.NewRGBA(rect)	1✔
34	draw.Draw(rgba, rect, img, rect.Min, draw.Src)	1✔
35	}	1✔
36	return vips.NewImageFromMemory(rgba.Pix, size.X, size.Y, 4)	1✔
37	}
38
39	func BmpFallbackFunc(blob imagor.Blob, _ vips.LoadOptions) (*vips.Image, error) {	1✔
40	if blob.BlobType() == imagor.BlobTypeBMP {	2✔
41	// fallback with Go BMP decoder if vips error on BMP	1✔
42	r, _, err := blob.NewReader()	1✔
43	if err != nil {	1✔
NEW 44	return nil, err	×
NEW 45	}	×
46	defer func() {	2✔
47	_ = r.Close()	1✔
48	}()	1✔
49	return loadImageFromBMP(r)	1✔
50	} else {	1✔
51	return nil, imagor.ErrUnsupportedFormat	1✔
52	}	1✔
53	}

cshum / imagor / 15327829984

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous