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

resize: move effects to more explicit methods

Browse source 
add method shouldApplyEffects and applyEffects
This commit is contained in:
Thomas Meson 2015-09-15 11:28:05 +02:00
parent 6968a8a453
commit b74cbd5173
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resize.go
View file

@ -88,6 +88,14 @@ func Resize(buf []byte, o Options) ([]byte, error) {
} }
} }
// Apply effects, if necessary
if shouldApplyEffects(o) {
image, err = applyEffects(image, o)
if err != nil {
return nil, err
}
}
// Add watermark, if necessary // Add watermark, if necessary
image, err = watermakImage(image, o.Watermark) image, err = watermakImage(image, o.Watermark)
if err != nil { if err != nil {
@ -135,8 +143,11 @@ func normalizeOperation(o *Options, inWidth, inHeight int) {
func shouldTransformImage(o Options, inWidth, inHeight int) bool { func shouldTransformImage(o Options, inWidth, inHeight int) bool {
return o.Force || (o.Width > 0 && o.Width != inWidth) || return o.Force || (o.Width > 0 && o.Width != inWidth) ||
(o.Height > 0 && o.Height != inHeight) || o.AreaWidth > 0 || o.AreaHeight > 0 || (o.Height > 0 && o.Height != inHeight) || o.AreaWidth > 0 || o.AreaHeight > 0
o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0 }
func shouldApplyEffects(o Options) bool {
return o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0
} }
func transformImage(image *C.VipsImage, o Options, shrink int, residual float64) (*C.VipsImage, error) { func transformImage(image *C.VipsImage, o Options, shrink int, residual float64) (*C.VipsImage, error) {
@ -173,6 +184,15 @@ func transformImage(image *C.VipsImage, o Options, shrink int, residual float64)
return nil, err return nil, err
} }
debug("Transform: shrink=%v, residual=%v, interpolator=%v",
shrink, residual, o.Interpolator.String())
return image, nil
}
func applyEffects(image *C.VipsImage, o Options) (*C.VipsImage, error) {
var err error
if o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0 { if o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0 {
image, err = vipsGaussianBlur(image, o.GaussianBlur) image, err = vipsGaussianBlur(image, o.GaussianBlur)
if err != nil { if err != nil {
@ -180,8 +200,8 @@ func transformImage(image *C.VipsImage, o Options, shrink int, residual float64)
} }
} }
debug("Transform: shrink=%v, residual=%v, interpolator=%v", debug("Effects: gaussSigma=%v, gaussMinAmpl=%v",
shrink, residual, o.Interpolator.String()) o.GaussianBlur.Sigma, o.GaussianBlur.MinAmpl)
return image, nil return image, nil
} }