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

feat(#18, #17)

Browse source
This commit is contained in:
Tomas Aparicio 2015-04-07 23:02:31 +02:00
parent b93919d182
commit 16576f49c9
6 changed files with 170 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resize.go
View file

@ -45,14 +45,14 @@ func Resize(buf []byte, o Options) ([]byte, error) {
inHeight := int(image.Ysize)
// image calculations
factor := imageCalculations(o, inWidth, inHeight)
factor := imageCalculations(&o, inWidth, inHeight)
shrink := int(math.Max(math.Floor(factor), 1))
residual := float64(shrink) / factor
// Do not enlarge the output if the input width *or* height are already less than the required dimensions
if o.Enlarge == false {
if inWidth < o.Width && inHeight < o.Height {
factor = 1
factor = 1.0
shrink = 1
residual = 0
o.Width = inWidth
@ -169,7 +169,6 @@ func rotateImage(image *C.struct__VipsImage, o Options) (*C.struct__VipsImage, e
if o.Rotate > 0 {
image, err = vipsRotate(image, getAngle(o.Rotate))
}
if o.Flip > 0 {
image, err = vipsFlip(image, o.Flip)
}
@ -223,7 +222,7 @@ func shrinkJpegImage(buf []byte, input *C.struct__VipsImage, factor float64, shr
return image, factor, err
}
func imageCalculations(o Options, inWidth, inHeight int) float64 {
func imageCalculations(o *Options, inWidth, inHeight int) float64 {
factor := 1.0
xfactor := float64(inWidth) / float64(o.Width)
yfactor := float64(inHeight) / float64(o.Height)