gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-07 21:48:13 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(vips): check magick type support

Browse source
This commit is contained in:
Tomas Aparicio 2016-09-29 20:49:34 +01:00
parent dfd6e8fe2d
commit 8e0592bb9a
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
type.go
View file

@ -106,15 +106,15 @@ func IsImageTypeSupportedByVips(t ImageType) bool {
imageMutex.RLock()
// Discover supported image types and cache the result
itShouldDiscovery := len(SupportedImageTypes) == 0
if itShouldDiscovery {
itShouldDiscover := len(SupportedImageTypes) == 0
if itShouldDiscover {
imageMutex.RUnlock()
discoverSupportedImageTypes()
}
// Check if image type is actually supported
isSupported, ok := SupportedImageTypes[t]
if !itShouldDiscovery {
if !itShouldDiscover {
imageMutex.RUnlock()
}

5
vips.go
View file

@ -161,6 +161,9 @@ func VipsIsTypeSupported(t ImageType) bool {
if t == TIFF {
return int(C.vips_type_find_bridge(C.TIFF)) != 0
}
if t == MAGICK {
return int(C.vips_type_find_bridge(C.MAGICK)) != 0
}
return false
}
@ -512,7 +515,7 @@ func vipsImageType(buf []byte) ImageType {
if IsImageTypeSupportedByVips(SVG) && IsSVGImage(buf) {
return SVG
}
if strings.HasSuffix(readImageType(buf), "MagickBuffer") {
if IsImageTypeSupportedByVips(MAGICK) && strings.HasSuffix(readImageType(buf), "MagickBuffer") {
return MAGICK
}
return UNKNOWN