aw/go-resize
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'anisus-master'

Browse Source 
Fixes #14, regression from 494d8de4e5
This commit is contained in:
jst 2014-06-18 19:05:59 +02:00
commit bdfbbead13
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resize.go
View File

@ -61,7 +61,7 @@ func Resize(width, height uint, img image.Image, interp InterpolationFunction) i
c := make(chan int, n) c := make(chan int, n)
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
slice := image.Rect(b.Min.X, b.Min.Y+i*(b.Dy())/n, b.Max.X, b.Min.Y+(i+1)*(b.Dy())/n) slice := image.Rect(b.Min.X, b.Min.Y+i*(b.Dy())/n, b.Max.X, b.Min.Y+(i+1)*(b.Dy())/n)
go resizeSlice(img, tempImg, interp, scaleX, adjust, float32(oldBounds.Min.X), slice, c) go resizeSlice(img, tempImg, interp, scaleX, adjust, float32(oldBounds.Min.X), oldBounds.Min.Y, slice, c)
} }
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
<-c <-c
@ -73,7 +73,7 @@ func Resize(width, height uint, img image.Image, interp InterpolationFunction) i
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
slice := image.Rect(b.Min.X, b.Min.Y+i*(b.Dy())/n, b.Max.X, b.Min.Y+(i+1)*(b.Dy())/n) slice := image.Rect(b.Min.X, b.Min.Y+i*(b.Dy())/n, b.Max.X, b.Min.Y+(i+1)*(b.Dy())/n)
go resizeSlice(tempImg, resultImg, interp, scaleY, adjust, float32(oldBounds.Min.Y), slice, c) go resizeSlice(tempImg, resultImg, interp, scaleY, adjust, 0, 0, slice, c)
} }
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
<-c <-c
@ -83,15 +83,15 @@ func Resize(width, height uint, img image.Image, interp InterpolationFunction) i
} }
// Resize a rectangle image slice // Resize a rectangle image slice
func resizeSlice(input image.Image, output *image.RGBA64, interp InterpolationFunction, scale, adjust, offset float32, slice image.Rectangle, c chan int) { func resizeSlice(input image.Image, output *image.RGBA64, interp InterpolationFunction, scale, adjust, xoffset float32, yoffset int, slice image.Rectangle, c chan int) {
filter := interp(input, float32(clampFactor(scale))) filter := interp(input, float32(clampFactor(scale)))
var u float32 var u float32
var color color.RGBA64 var color color.RGBA64
for y := slice.Min.Y; y < slice.Max.Y; y++ { for y := slice.Min.Y; y < slice.Max.Y; y++ {
u = scale*(float32(y)+adjust) + offset u = scale*(float32(y)+adjust) + xoffset
filter.SetKernelWeights(u) filter.SetKernelWeights(u)
for x := slice.Min.X; x < slice.Max.X; x++ { for x := slice.Min.X; x < slice.Max.X; x++ {
color = filter.Interpolate(u, x) color = filter.Interpolate(u, x+yoffset)
i := output.PixOffset(x, y) i := output.PixOffset(x, y)
output.Pix[i+0] = uint8(color.R >> 8) output.Pix[i+0] = uint8(color.R >> 8)
output.Pix[i+1] = uint8(color.R) output.Pix[i+1] = uint8(color.R)