diff --git a/image.go b/image.go index 36303363d..f76035eb1 100644 --- a/image.go +++ b/image.go @@ -133,15 +133,6 @@ type DrawImageOptions struct { // If either is FilterDefault and the other is not, the latter is used. // Otherwise, Filter specified at DrawImageOptions is used. Filter Filter - - // Deprecated: (as of 1.5.0) Use SubImage instead. - ImageParts ImageParts - - // Deprecated: (as of 1.1.0) Use SubImage instead. - Parts []ImagePart - - // Deprecated: (as of 1.9.0) Use SubImage instead. - SourceRect *image.Rectangle } // DrawImage draws the given image on the image i. @@ -202,43 +193,7 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error { options = &DrawImageOptions{} } - parts := options.ImageParts - // Parts is deprecated. This implementations is for backward compatibility. - if parts == nil && options.Parts != nil { - parts = imageParts(options.Parts) - } - - // ImageParts is deprecated. This implementations is for backward compatibility. - if parts != nil { - l := parts.Len() - for idx := 0; idx < l; idx++ { - sx0, sy0, sx1, sy1 := parts.Src(idx) - dx0, dy0, dx1, dy1 := parts.Dst(idx) - op := &DrawImageOptions{ - ColorM: options.ColorM, - CompositeMode: options.CompositeMode, - Filter: options.Filter, - } - op.GeoM.Scale( - float64(dx1-dx0)/float64(sx1-sx0), - float64(dy1-dy0)/float64(sy1-sy0)) - op.GeoM.Translate(float64(dx0), float64(dy0)) - op.GeoM.Concat(options.GeoM) - i.DrawImage(img.SubImage(image.Rect(sx0, sy0, sx1, sy1)).(*Image), op) - } - return nil - } - bounds := img.Bounds() - - // SourceRect is deprecated. This implementation is for backward compatibility. - if options.SourceRect != nil { - bounds = bounds.Intersect(*options.SourceRect) - if bounds.Empty() { - return nil - } - } - mode := driver.CompositeMode(options.CompositeMode) filter := driver.FilterNearest diff --git a/imageparts.go b/imageparts.go deleted file mode 100644 index 80cc2a981..000000000 --- a/imageparts.go +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2015 Hajime Hoshi -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ebiten - -import ( - "image" -) - -// ImagePart is sub image regions of the source and destination images. -// -// Deprecated: (as of 1.1.0) Use SubImage instead. -type ImagePart struct { - Dst image.Rectangle - Src image.Rectangle -} - -// ImageParts is sub image regions of the source and destination images. -// -// Deprecated: (as of 1.5.0) Use SubImage instead. -type ImageParts interface { - Len() int - Dst(i int) (x0, y0, x1, y1 int) - Src(i int) (x0, y0, x1, y1 int) -} - -// NOTE: Remove this in the future. -type imageParts []ImagePart - -func (p imageParts) Len() int { - return len(p) -} - -func (p imageParts) Dst(i int) (x0, y0, x1, y1 int) { - dst := &p[i].Dst - return dst.Min.X, dst.Min.Y, dst.Max.X, dst.Max.Y -} - -func (p imageParts) Src(i int) (x0, y0, x1, y1 int) { - src := &p[i].Src - return src.Min.X, src.Min.Y, src.Max.X, src.Max.Y -}