gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-16 10:55:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Saving to TIFF should also fail

Browse source 
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
This commit is contained in:
Yoan Blanc 2016-11-13 17:38:34 +01:00
parent e099e4c9f5
commit 190fe92e28
No known key found for this signature in database
GPG key ID: 6058CF4574298812
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vips.go
View file

@ -8,6 +8,7 @@ import "C"
import ( import (
"errors" "errors"
"fmt"
"math" "math"
"os" "os"
"runtime" "runtime"
@ -370,21 +371,14 @@ func vipsSave(image *C.VipsImage, o vipsSaveOptions) ([]byte, error) {
switch o.Type { switch o.Type {
case WEBP: case WEBP:
saveErr = C.vips_webpsave_bridge(tmpImage, &ptr, &length, 1, quality) saveErr = C.vips_webpsave_bridge(tmpImage, &ptr, &length, 1, quality)
break
case PNG: case PNG:
saveErr = C.vips_pngsave_bridge(tmpImage, &ptr, &length, 1, C.int(o.Compression), quality, interlace) saveErr = C.vips_pngsave_bridge(tmpImage, &ptr, &length, 1, C.int(o.Compression), quality, interlace)
break case 0:
case GIF:
return nil, errors.New("VIPS cannot save to GIF")
case PDF:
return nil, errors.New("VIPS cannot save to PDF")
case SVG:
return nil, errors.New("VIPS cannot save to SVG")
case MAGICK:
return nil, errors.New("VIPS cannot save to MAGICK")
default:
saveErr = C.vips_jpegsave_bridge(tmpImage, &ptr, &length, 1, quality, interlace) saveErr = C.vips_jpegsave_bridge(tmpImage, &ptr, &length, 1, quality, interlace)
break case JPEG:
saveErr = C.vips_jpegsave_bridge(tmpImage, &ptr, &length, 1, quality, interlace)
default:
return nil, fmt.Errorf("VIPS cannot save to %v.", ImageTypes[o.Type])
} }
if int(saveErr) != 0 { if int(saveErr) != 0 {

10
vips_test.go
View file

@ -29,7 +29,7 @@ func TestVipsRead(t *testing.T) {
} }
func TestVipsSave(t *testing.T) { func TestVipsSave(t *testing.T) {
types := [...]ImageType{JPEG, PNG, TIFF, WEBP} types := [...]ImageType{JPEG, PNG, WEBP}
for _, typ := range types { for _, typ := range types {
image, _, _ := vipsRead(readImage("test.jpg")) image, _, _ := vipsRead(readImage("test.jpg"))
@ -46,7 +46,7 @@ func TestVipsSave(t *testing.T) {
} }
func TestVipsCannotSave(t *testing.T) { func TestVipsCannotSave(t *testing.T) {
types := [...]ImageType{GIF, PDF, SVG, MAGICK} types := [...]ImageType{GIF, MAGICK, PDF, SVG, TIFF}
for _, typ := range types { for _, typ := range types {
image, _, _ := vipsRead(readImage("test.jpg")) image, _, _ := vipsRead(readImage("test.jpg"))
@ -118,9 +118,9 @@ func TestVipsWatermark(t *testing.T) {
t.Errorf("Cannot add watermark: %s", err) t.Errorf("Cannot add watermark: %s", err)
} }
buf, _ := vipsSave(newImg, vipsSaveOptions{Quality: 95}) buf, err := vipsSave(newImg, vipsSaveOptions{Quality: 95})
if len(buf) == 0 { if len(buf) == 0 || err != nil {
t.Fatal("Empty image") t.Fatalf("Empty image. %#v", err)
} }
} }