commit 491771c681427e82b9843267b24b32cf56743e83
author Dmitri Shuralyov <dmitshur@golang.org> Thu Sep 07 23:48:30 2023 -0400
committer Gopher Robot <gobot@golang.org> Fri Sep 08 23:15:47 2023 +0000
tree a64589f597c96610e28476f0d0a2a18ea0a679cd
parent 4aa0222fac539f4a04a4378b75b70ad6e1820ecb

draw: merge draw_go117.go into draw.go

This can be done as Go 1.21 and 1.20 are the supported
versions by now, and Go 1.16 is long since unsupported.

Change-Id: Ib90f796d6c38dbb9ffd99d56faf344ee9784f9bc
Reviewed-on: https://go-review.googlesource.com/c/image/+/526896
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Nigel Tao (INACTIVE; USE @golang.org INSTEAD) <nigeltao@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Nigel Tao <nigeltao@golang.org>

draw/draw.go

diff --git a/draw/draw.go b/draw/draw.go
index cd5aaba..42d5d7e 100644
--- a/draw/draw.go
+++ b/draw/draw.go
@@ -47,6 +47,12 @@
 // Image is an image.Image with a Set method to change a single pixel.
 type Image = draw.Image
 
+// RGBA64Image extends both the Image and image.RGBA64Image interfaces with a
+// SetRGBA64 method to change a single pixel. SetRGBA64 is equivalent to
+// calling Set, but it can avoid allocations from converting concrete color
+// types to the color.Color interface type.
+type RGBA64Image = draw.RGBA64Image
+
 // Op is a Porter-Duff compositing operator.
 type Op = draw.Op
 

draw/draw_go117.go

diff --git a/draw/draw_go117.go b/draw/draw_go117.go
deleted file mode 100644
index 2e97caa..0000000
--- a/draw/draw_go117.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.17
-
-package draw
-
-import (
-	"image/draw"
-)
-
-// The package documentation, in draw.go, gives the intent of this package:
-//
-//     This package is a superset of and a drop-in replacement for the
-//     image/draw package in the standard library.
-//
-// "Drop-in replacement" means that we use type aliases in this file.
-//
-// TODO: move the type aliases to draw.go once Go 1.16 is no longer supported.
-
-// RGBA64Image extends both the Image and image.RGBA64Image interfaces with a
-// SetRGBA64 method to change a single pixel. SetRGBA64 is equivalent to
-// calling Set, but it can avoid allocations from converting concrete color
-// types to the color.Color interface type.
-type RGBA64Image = draw.RGBA64Image