highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-04 18:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

varargs for vipsError

Browse Source
This commit is contained in:
Viktor Sokolov
2025-07-02 11:59:49 +02:00
parent 99cdb54411
commit 22778f020d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vips/source.go
View File

@@ -27,13 +27,13 @@ func imgproxyReaderSeek(handle C.uintptr_t, offset C.int64_t, whence int) C.int6
h := cgo.Handle(handle)
reader, ok := h.Value().(io.ReadSeeker)
if !ok {
vipsError("imgproxyReaderSeek", "failed to cast handle to io.ReadSeeker", nil)
vipsError("imgproxyReaderSeek", "failed to cast handle to io.ReadSeeker")
return -1
}
pos, err := reader.Seek(int64(offset), whence)
if err != nil {
vipsError("imgproxyReaderSeek", "failed to seek", err)
vipsError("imgproxyReaderSeek", "failed to seek: %w", err)
return -1
}
@@ -47,7 +47,7 @@ func imgproxyReaderRead(handle C.uintptr_t, pointer unsafe.Pointer, size C.int64
h := cgo.Handle(handle)
reader, ok := h.Value().(io.ReadSeeker)
if !ok {
vipsError("imgproxyReaderRead", "invalid reader handle", nil)
vipsError("imgproxyReaderRead", "invalid reader handle")
return -1
}
@@ -56,7 +56,7 @@ func imgproxyReaderRead(handle C.uintptr_t, pointer unsafe.Pointer, size C.int64
if err == io.EOF {
return 0
} else if err != nil {
vipsError("imgproxyReaderRead", "error reading from imgproxy source", err)
vipsError("imgproxyReaderRead", "error reading from imgproxy source: %w", err)
return -1
}

6
vips/vips.go
View File

@@ -953,13 +953,11 @@ func (img *Image) StripAll() error {
return nil
}
func vipsError(fn string, msg string, err error) {
func vipsError(fn string, msg string, args ...any) {
fnStr := C.CString(fn)
defer C.free(unsafe.Pointer(fnStr))
if err != nil {
msg = fmt.Sprintf("%s: %s", msg, err.Error())
}
msg = fmt.Sprintf(msg, args...)
msgStr := C.CString(msg)
defer C.free(unsafe.Pointer(msgStr))