self-hosted/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-11-27 22:48:53 +02:00
Code Issues Releases Activity

Load ICO with vips_magickload

Browse Source
This commit is contained in:
DarthSim
2019-09-30 16:03:07 +06:00
parent 52152bcf47
commit 4d06d397fe
9 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vips.go
View File

@@ -8,12 +8,15 @@ package main
*/
import "C"
import (
"bytes"
"context"
"math"
"os"
"runtime"
"time"
"unsafe"
imageSize "github.com/imgproxy/imgproxy/image_size"
)
type vipsImage struct {
@@ -88,6 +91,9 @@ func initVips() {
if int(C.vips_type_find_load_go(C.int(imageTypeSVG))) != 0 {
vipsTypeSupportLoad[imageTypeSVG] = true
}
if int(C.vips_type_find_load_go(C.int(imageTypeICO))) != 0 {
vipsTypeSupportLoad[imageTypeICO] = true
}
if int(C.vips_type_find_load_go(C.int(imageTypeHEIC))) != 0 {
vipsTypeSupportLoad[imageTypeHEIC] = true
}
@@ -95,9 +101,6 @@ func initVips() {
vipsTypeSupportLoad[imageTypeTIFF] = true
}
// we load ICO with github.com/mat/besticon/ico and send decoded data to vips
vipsTypeSupportLoad[imageTypeICO] = true
if int(C.vips_type_find_save_go(C.int(imageTypeJPEG))) != 0 {
vipsTypeSupportSave[imageTypeJPEG] = true
}
@@ -197,12 +200,12 @@ func (img *vipsImage) Load(data []byte, imgtype imageType, shrink int, scale flo
case imageTypeSVG:
err = C.vips_svgload_go(unsafe.Pointer(&data[0]), C.size_t(len(data)), C.double(scale), &tmp)
case imageTypeICO:
rawData, width, height, icoErr := icoData(data)
if icoErr != nil {
return icoErr
bestPage, ierr := imageSize.BestIcoPage(bytes.NewBuffer(data))
if ierr != nil {
logWarning(ierr.Error())
}
tmp = C.vips_image_new_from_memory_copy(unsafe.Pointer(&rawData[0]), C.size_t(width*height*4), C.int(width), C.int(height), 4, C.VIPS_FORMAT_UCHAR)
err = C.vips_icoload_go(unsafe.Pointer(&data[0]), C.size_t(len(data)), C.int(bestPage), &tmp)
case imageTypeHEIC:
err = C.vips_heifload_go(unsafe.Pointer(&data[0]), C.size_t(len(data)), &tmp)
case imageTypeTIFF: