From 4a48937ef172df630e8bf610a38df0f5a887d243 Mon Sep 17 00:00:00 2001 From: shengxinjing <316783812@qq.com> Date: Thu, 25 Sep 2025 21:25:37 +0100 Subject: [PATCH] refactor: use builtin max and min --- model/models/llama4/process_image.go | 6 +++--- model/models/mllama/process_image.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/model/models/llama4/process_image.go b/model/models/llama4/process_image.go index 916f6f90..bfeb6433 100644 --- a/model/models/llama4/process_image.go +++ b/model/models/llama4/process_image.go @@ -73,7 +73,7 @@ func (p ImageProcessor) bestResolution(img image.Point, possibleResolutions []im for i, res := range possibleResolutions { scaleW := float64(res.X) / float64(w) scaleH := float64(res.Y) / float64(h) - scale := math.Min(scaleW, scaleH) + scale := min(scaleW, scaleH) scales[i] = scale } @@ -124,11 +124,11 @@ func (p ImageProcessor) maxResolution(imageRes, targetRes image.Point) image.Poi if scaleW < scaleH { newRes = image.Point{ targetRes.X, - int(math.Min(math.Floor(float64(imageRes.Y)*scaleW), float64(targetRes.Y))), + int(math.Floor(float64(imageRes.Y)*scaleW), float64(targetRes.Y))), } } else { newRes = image.Point{ - int(math.Min(math.Floor(float64(imageRes.X)*scaleH), float64(targetRes.X))), + int(min(math.Floor(float64(imageRes.X)*scaleH), float64(targetRes.X))), targetRes.Y, } } diff --git a/model/models/mllama/process_image.go b/model/models/mllama/process_image.go index 8e60508f..7ab3de9f 100644 --- a/model/models/mllama/process_image.go +++ b/model/models/mllama/process_image.go @@ -53,7 +53,7 @@ func (p ImageProcessor) fitToCanvas(imageSize, canvasSize image.Point) image.Poi tw := min(max(imageSize.X, p.imageSize), canvasSize.X) th := min(max(imageSize.Y, p.imageSize), canvasSize.Y) - r := math.Min( + r := min( float64(tw)/float64(imageSize.X), float64(th)/float64(imageSize.Y), ) @@ -89,10 +89,10 @@ func (p ImageProcessor) optimalTiledCanvas(imageSize image.Point) image.Point { if minUpscale == 0 { minUpscale = s } else { - minUpscale = math.Min(minUpscale, s) + minUpscale = min(minUpscale, s) } } else { - maxDownscale = math.Max(maxDownscale, s) + maxDownscale = max(maxDownscale, s) } }