summaryrefslogtreecommitdiff
path: root/src/util/util.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/util.go')
-rw-r--r--src/util/util.go16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/util/util.go b/src/util/util.go
index c8301363..f11a0887 100644
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -97,24 +97,12 @@ func Min32(first int32, second int32) int32 {
// Constrain32 limits the given 32-bit integer with the upper and lower bounds
func Constrain32(val int32, min int32, max int32) int32 {
- if val < min {
- return min
- }
- if val > max {
- return max
- }
- return val
+ return Max32(Min32(val, max), min)
}
// Constrain limits the given integer with the upper and lower bounds
func Constrain(val int, min int, max int) int {
- if val < min {
- return min
- }
- if val > max {
- return max
- }
- return val
+ return Max(Min(val, max), min)
}
func AsUint16(val int) uint16 {