Skip to content
Snippets Groups Projects
Commit cea8eb6f authored by renovate's avatar renovate
Browse files

Update github.com/nfnt/resize commit hash to 83c6a99

parent 63002dfa
No related branches found
No related tags found
1 merge request!4Update github.com/nfnt/resize commit hash to 83c6a99
Pipeline #11535 passed
Stage: test
Show whitespace changes
Inline Side-by-side
go.mod
+ 1
− 1
View file @ cea8eb6f
...@@ -11,7 +11,7 @@ require ( ...@@ -11,7 +11,7 @@ require (
github.com/google/subcommands v1.2.0 github.com/google/subcommands v1.2.0
github.com/gorilla/mux v1.6.3-0.20181030152528-3d80bc801bb0 github.com/gorilla/mux v1.6.3-0.20181030152528-3d80bc801bb0
github.com/meskio/epubgo v0.0.0-20160213181628-90dd5d78197f github.com/meskio/epubgo v0.0.0-20160213181628-90dd5d78197f
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285 github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285
github.com/tinylib/msgp v1.1.5 // indirect github.com/tinylib/msgp v1.1.5 // indirect
github.com/willf/bitset v1.1.11 // indirect github.com/willf/bitset v1.1.11 // indirect
......
go.sum
+ 2
− 0
View file @ cea8eb6f
...@@ -101,6 +101,8 @@ github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= ...@@ -101,6 +101,8 @@ github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
......
vendor/github.com/nfnt/resize/.travis.yml
+ 4
− 4
View file @ cea8eb6f
language: go language: go
go: go:
- 1.1 - "1.x"
- 1.2 - "1.1"
- 1.3 - "1.4"
- tip - "1.10"
vendor/github.com/nfnt/resize/README.md
+ 2
− 0
View file @ cea8eb6f
# This package is no longer being updated! Please look for alternatives if that bothers you.
Resize Resize
====== ======
......
vendor/github.com/nfnt/resize/resize.go
+ 6
− 0
View file @ cea8eb6f
...@@ -78,6 +78,7 @@ var blur = 1.0 ...@@ -78,6 +78,7 @@ var blur = 1.0
// If one of the parameters width or height is set to 0, its size will be calculated so that // If one of the parameters width or height is set to 0, its size will be calculated so that
// the aspect ratio is that of the originating image. // the aspect ratio is that of the originating image.
// The resizing algorithm uses channels for parallel computation. // The resizing algorithm uses channels for parallel computation.
// If the input image has width or height of 0, it is returned unchanged.
func Resize(width, height uint, img image.Image, interp InterpolationFunction) image.Image { func Resize(width, height uint, img image.Image, interp InterpolationFunction) image.Image {
scaleX, scaleY := calcFactors(width, height, float64(img.Bounds().Dx()), float64(img.Bounds().Dy())) scaleX, scaleY := calcFactors(width, height, float64(img.Bounds().Dx()), float64(img.Bounds().Dy()))
if width == 0 { if width == 0 {
...@@ -92,6 +93,11 @@ func Resize(width, height uint, img image.Image, interp InterpolationFunction) i ...@@ -92,6 +93,11 @@ func Resize(width, height uint, img image.Image, interp InterpolationFunction) i
return img return img
} }
// Input image has no pixels
if img.Bounds().Dx() <= 0 || img.Bounds().Dy() <= 0 {
return img
}
if interp == NearestNeighbor { if interp == NearestNeighbor {
return resizeNearest(width, height, scaleX, scaleY, img, interp) return resizeNearest(width, height, scaleX, scaleY, img, interp)
} }
......
vendor/github.com/nfnt/resize/ycc.go
+ 275
− 115
View file @ cea8eb6f
...@@ -88,140 +88,300 @@ func newYCC(r image.Rectangle, s image.YCbCrSubsampleRatio) *ycc { ...@@ -88,140 +88,300 @@ func newYCC(r image.Rectangle, s image.YCbCrSubsampleRatio) *ycc {
return &ycc{Pix: buf, Stride: 3 * w, Rect: r, SubsampleRatio: s} return &ycc{Pix: buf, Stride: 3 * w, Rect: r, SubsampleRatio: s}
} }
// Copy of image.YCbCrSubsampleRatio constants - this allows us to support
// older versions of Go where these constants are not defined (i.e. Go 1.4)
const (
ycbcrSubsampleRatio444 image.YCbCrSubsampleRatio = iota
ycbcrSubsampleRatio422
ycbcrSubsampleRatio420
ycbcrSubsampleRatio440
ycbcrSubsampleRatio411
ycbcrSubsampleRatio410
)
// YCbCr converts ycc to a YCbCr image with the same subsample ratio // YCbCr converts ycc to a YCbCr image with the same subsample ratio
// as the YCbCr image that ycc was generated from. // as the YCbCr image that ycc was generated from.
func (p *ycc) YCbCr() *image.YCbCr { func (p *ycc) YCbCr() *image.YCbCr {
ycbcr := image.NewYCbCr(p.Rect, p.SubsampleRatio) ycbcr := image.NewYCbCr(p.Rect, p.SubsampleRatio)
switch ycbcr.SubsampleRatio {
case ycbcrSubsampleRatio422:
return p.ycbcr422(ycbcr)
case ycbcrSubsampleRatio420:
return p.ycbcr420(ycbcr)
case ycbcrSubsampleRatio440:
return p.ycbcr440(ycbcr)
case ycbcrSubsampleRatio444:
return p.ycbcr444(ycbcr)
case ycbcrSubsampleRatio411:
return p.ycbcr411(ycbcr)
case ycbcrSubsampleRatio410:
return p.ycbcr410(ycbcr)
}
return ycbcr
}
// imageYCbCrToYCC converts a YCbCr image to a ycc image for resizing.
func imageYCbCrToYCC(in *image.YCbCr) *ycc {
w, h := in.Rect.Dx(), in.Rect.Dy()
p := ycc{
Pix: make([]uint8, 3*w*h),
Stride: 3 * w,
Rect: image.Rect(0, 0, w, h),
SubsampleRatio: in.SubsampleRatio,
}
switch in.SubsampleRatio {
case ycbcrSubsampleRatio422:
return convertToYCC422(in, &p)
case ycbcrSubsampleRatio420:
return convertToYCC420(in, &p)
case ycbcrSubsampleRatio440:
return convertToYCC440(in, &p)
case ycbcrSubsampleRatio444:
return convertToYCC444(in, &p)
case ycbcrSubsampleRatio411:
return convertToYCC411(in, &p)
case ycbcrSubsampleRatio410:
return convertToYCC410(in, &p)
}
return &p
}
func (p *ycc) ycbcr422(ycbcr *image.YCbCr) *image.YCbCr {
var off int var off int
Pix := p.Pix
Y := ycbcr.Y
Cb := ycbcr.Cb
Cr := ycbcr.Cr
for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
yy := y * ycbcr.YStride
cy := y * ycbcr.CStride
for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ci := cy + x/2
Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3
}
}
return ycbcr
}
switch ycbcr.SubsampleRatio { func (p *ycc) ycbcr420(ycbcr *image.YCbCr) *image.YCbCr {
case image.YCbCrSubsampleRatio422: var off int
for y := ycbcr.Rect.Min.Y; y < ycbcr.Rect.Max.Y; y++ { Pix := p.Pix
yy := (y - ycbcr.Rect.Min.Y) * ycbcr.YStride Y := ycbcr.Y
cy := (y - ycbcr.Rect.Min.Y) * ycbcr.CStride Cb := ycbcr.Cb
for x := ycbcr.Rect.Min.X; x < ycbcr.Rect.Max.X; x++ { Cr := ycbcr.Cr
xx := (x - ycbcr.Rect.Min.X) for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
yi := yy + xx yy := y * ycbcr.YStride
ci := cy + xx/2 cy := (y / 2) * ycbcr.CStride
ycbcr.Y[yi] = p.Pix[off+0] for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ycbcr.Cb[ci] = p.Pix[off+1] ci := cy + x/2
ycbcr.Cr[ci] = p.Pix[off+2] Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3 off += 3
} }
} }
case image.YCbCrSubsampleRatio420: return ycbcr
for y := ycbcr.Rect.Min.Y; y < ycbcr.Rect.Max.Y; y++ { }
yy := (y - ycbcr.Rect.Min.Y) * ycbcr.YStride
cy := (y/2 - ycbcr.Rect.Min.Y/2) * ycbcr.CStride func (p *ycc) ycbcr440(ycbcr *image.YCbCr) *image.YCbCr {
for x := ycbcr.Rect.Min.X; x < ycbcr.Rect.Max.X; x++ { var off int
xx := (x - ycbcr.Rect.Min.X) Pix := p.Pix
yi := yy + xx Y := ycbcr.Y
ci := cy + xx/2 Cb := ycbcr.Cb
ycbcr.Y[yi] = p.Pix[off+0] Cr := ycbcr.Cr
ycbcr.Cb[ci] = p.Pix[off+1] for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
ycbcr.Cr[ci] = p.Pix[off+2] yy := y * ycbcr.YStride
cy := (y / 2) * ycbcr.CStride
for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ci := cy + x
Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3 off += 3
} }
} }
case image.YCbCrSubsampleRatio440: return ycbcr
for y := ycbcr.Rect.Min.Y; y < ycbcr.Rect.Max.Y; y++ { }
yy := (y - ycbcr.Rect.Min.Y) * ycbcr.YStride
cy := (y/2 - ycbcr.Rect.Min.Y/2) * ycbcr.CStride func (p *ycc) ycbcr444(ycbcr *image.YCbCr) *image.YCbCr {
for x := ycbcr.Rect.Min.X; x < ycbcr.Rect.Max.X; x++ { var off int
xx := (x - ycbcr.Rect.Min.X) Pix := p.Pix
yi := yy + xx Y := ycbcr.Y
ci := cy + xx Cb := ycbcr.Cb
ycbcr.Y[yi] = p.Pix[off+0] Cr := ycbcr.Cr
ycbcr.Cb[ci] = p.Pix[off+1] for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
ycbcr.Cr[ci] = p.Pix[off+2] yy := y * ycbcr.YStride
cy := y * ycbcr.CStride
for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ci := cy + x
Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3 off += 3
} }
} }
default: return ycbcr
// Default to 4:4:4 subsampling. }
for y := ycbcr.Rect.Min.Y; y < ycbcr.Rect.Max.Y; y++ {
yy := (y - ycbcr.Rect.Min.Y) * ycbcr.YStride func (p *ycc) ycbcr411(ycbcr *image.YCbCr) *image.YCbCr {
cy := (y - ycbcr.Rect.Min.Y) * ycbcr.CStride var off int
for x := ycbcr.Rect.Min.X; x < ycbcr.Rect.Max.X; x++ { Pix := p.Pix
xx := (x - ycbcr.Rect.Min.X) Y := ycbcr.Y
yi := yy + xx Cb := ycbcr.Cb
ci := cy + xx Cr := ycbcr.Cr
ycbcr.Y[yi] = p.Pix[off+0] for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
ycbcr.Cb[ci] = p.Pix[off+1] yy := y * ycbcr.YStride
ycbcr.Cr[ci] = p.Pix[off+2] cy := y * ycbcr.CStride
for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ci := cy + x/4
Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3 off += 3
} }
} }
return ycbcr
}
func (p *ycc) ycbcr410(ycbcr *image.YCbCr) *image.YCbCr {
var off int
Pix := p.Pix
Y := ycbcr.Y
Cb := ycbcr.Cb
Cr := ycbcr.Cr
for y := 0; y < ycbcr.Rect.Max.Y-ycbcr.Rect.Min.Y; y++ {
yy := y * ycbcr.YStride
cy := (y / 2) * ycbcr.CStride
for x := 0; x < ycbcr.Rect.Max.X-ycbcr.Rect.Min.X; x++ {
ci := cy + x/4
Y[yy+x] = Pix[off+0]
Cb[ci] = Pix[off+1]
Cr[ci] = Pix[off+2]
off += 3
}
} }
return ycbcr return ycbcr
} }
// imageYCbCrToYCC converts a YCbCr image to a ycc image for resizing. func convertToYCC422(in *image.YCbCr, p *ycc) *ycc {
func imageYCbCrToYCC(in *image.YCbCr) *ycc {
w, h := in.Rect.Dx(), in.Rect.Dy()
r := image.Rect(0, 0, w, h)
buf := make([]uint8, 3*w*h)
p := ycc{Pix: buf, Stride: 3 * w, Rect: r, SubsampleRatio: in.SubsampleRatio}
var off int var off int
Pix := p.Pix
Y := in.Y
Cb := in.Cb
Cr := in.Cr
for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
yy := y * in.YStride
cy := y * in.CStride
for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
ci := cy + x/2
Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3
}
}
return p
}
switch in.SubsampleRatio { func convertToYCC420(in *image.YCbCr, p *ycc) *ycc {
case image.YCbCrSubsampleRatio422: var off int
for y := in.Rect.Min.Y; y < in.Rect.Max.Y; y++ { Pix := p.Pix
yy := (y - in.Rect.Min.Y) * in.YStride Y := in.Y
cy := (y - in.Rect.Min.Y) * in.CStride Cb := in.Cb
for x := in.Rect.Min.X; x < in.Rect.Max.X; x++ { Cr := in.Cr
xx := (x - in.Rect.Min.X) for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
yi := yy + xx yy := y * in.YStride
ci := cy + xx/2 cy := (y / 2) * in.CStride
p.Pix[off+0] = in.Y[yi] for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
p.Pix[off+1] = in.Cb[ci] ci := cy + x/2
p.Pix[off+2] = in.Cr[ci] Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3 off += 3
} }
} }
case image.YCbCrSubsampleRatio420: return p
for y := in.Rect.Min.Y; y < in.Rect.Max.Y; y++ { }
yy := (y - in.Rect.Min.Y) * in.YStride
cy := (y/2 - in.Rect.Min.Y/2) * in.CStride func convertToYCC440(in *image.YCbCr, p *ycc) *ycc {
for x := in.Rect.Min.X; x < in.Rect.Max.X; x++ { var off int
xx := (x - in.Rect.Min.X) Pix := p.Pix
yi := yy + xx Y := in.Y
ci := cy + xx/2 Cb := in.Cb
p.Pix[off+0] = in.Y[yi] Cr := in.Cr
p.Pix[off+1] = in.Cb[ci] for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
p.Pix[off+2] = in.Cr[ci] yy := y * in.YStride
cy := (y / 2) * in.CStride
for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
ci := cy + x
Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3 off += 3
} }
} }
case image.YCbCrSubsampleRatio440: return p
for y := in.Rect.Min.Y; y < in.Rect.Max.Y; y++ { }
yy := (y - in.Rect.Min.Y) * in.YStride
cy := (y/2 - in.Rect.Min.Y/2) * in.CStride func convertToYCC444(in *image.YCbCr, p *ycc) *ycc {
for x := in.Rect.Min.X; x < in.Rect.Max.X; x++ { var off int
xx := (x - in.Rect.Min.X) Pix := p.Pix
yi := yy + xx Y := in.Y
ci := cy + xx Cb := in.Cb
p.Pix[off+0] = in.Y[yi] Cr := in.Cr
p.Pix[off+1] = in.Cb[ci] for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
p.Pix[off+2] = in.Cr[ci] yy := y * in.YStride
cy := y * in.CStride
for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
ci := cy + x
Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3 off += 3
} }
} }
default: return p
// Default to 4:4:4 subsampling. }
for y := in.Rect.Min.Y; y < in.Rect.Max.Y; y++ {
yy := (y - in.Rect.Min.Y) * in.YStride func convertToYCC411(in *image.YCbCr, p *ycc) *ycc {
cy := (y - in.Rect.Min.Y) * in.CStride var off int
for x := in.Rect.Min.X; x < in.Rect.Max.X; x++ { Pix := p.Pix
xx := (x - in.Rect.Min.X) Y := in.Y
yi := yy + xx Cb := in.Cb
ci := cy + xx Cr := in.Cr
p.Pix[off+0] = in.Y[yi] for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
p.Pix[off+1] = in.Cb[ci] yy := y * in.YStride
p.Pix[off+2] = in.Cr[ci] cy := y * in.CStride
for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
ci := cy + x/4
Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3 off += 3
} }
} }
return p
} }
return &p
func convertToYCC410(in *image.YCbCr, p *ycc) *ycc {
var off int
Pix := p.Pix
Y := in.Y
Cb := in.Cb
Cr := in.Cr
for y := 0; y < in.Rect.Max.Y-in.Rect.Min.Y; y++ {
yy := y * in.YStride
cy := (y / 2) * in.CStride
for x := 0; x < in.Rect.Max.X-in.Rect.Min.X; x++ {
ci := cy + x/4
Pix[off+0] = Y[yy+x]
Pix[off+1] = Cb[ci]
Pix[off+2] = Cr[ci]
off += 3
}
}
return p
} }
vendor/modules.txt
+ 1
− 1
View file @ cea8eb6f
...@@ -93,7 +93,7 @@ github.com/gorilla/mux ...@@ -93,7 +93,7 @@ github.com/gorilla/mux
github.com/meskio/epubgo github.com/meskio/epubgo
# github.com/mschoch/smat v0.2.0 # github.com/mschoch/smat v0.2.0
github.com/mschoch/smat github.com/mschoch/smat
# github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 # github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
## explicit ## explicit
github.com/nfnt/resize github.com/nfnt/resize
# github.com/philhofer/fwd v1.1.1 # github.com/philhofer/fwd v1.1.1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment