highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-10 04:02:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Watermark scale

Browse Source
This commit is contained in:
DarthSim
2018-10-28 18:05:57 +06:00
parent fe4810609a
commit c049fb8a28
4 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
processing_options.go
View File

@@ -103,6 +103,7 @@ type watermarkOptions struct {
Gravity gravityType
OffsetX int
OffsetY int
Scale float64
}
type processingOptions struct {
@@ -431,6 +432,10 @@ func applyPresetOption(po *processingOptions, args []string) error {
}
func applyWatermarkOption(po *processingOptions, args []string) error {
if len(args) > 7 {
return fmt.Errorf("Invalid watermark arguments: %v", args)
}
if o, err := strconv.ParseFloat(args[0], 64); err == nil && o >= 0 && o <= 1 {
po.Watermark.Enabled = o > 0
po.Watermark.Opacity = o
@@ -438,7 +443,7 @@ func applyWatermarkOption(po *processingOptions, args []string) error {
return fmt.Errorf("Invalid watermark opacity: %s", args[0])
}
if len(args) > 1 {
if len(args) > 1 && len(args[1]) > 0 {
if args[1] == "re" {
po.Watermark.Replicate = true
} else if g, ok := gravityTypes[args[1]]; ok && g != gravityFocusPoint && g != gravitySmart {
@@ -448,7 +453,7 @@ func applyWatermarkOption(po *processingOptions, args []string) error {
}
}
if len(args) > 2 {
if len(args) > 2 && len(args[2]) > 0 {
if x, err := strconv.Atoi(args[2]); err == nil {
po.Watermark.OffsetX = x
} else {
@@ -456,7 +461,7 @@ func applyWatermarkOption(po *processingOptions, args []string) error {
}
}
if len(args) > 3 {
if len(args) > 3 && len(args[3]) > 0 {
if y, err := strconv.Atoi(args[3]); err == nil {
po.Watermark.OffsetY = y
} else {
@@ -464,6 +469,14 @@ func applyWatermarkOption(po *processingOptions, args []string) error {
}
}
if len(args) > 4 && len(args[4]) > 0 {
if s, err := strconv.ParseFloat(args[4], 64); err == nil && s >= 0 {
po.Watermark.Scale = s
} else {
return fmt.Errorf("Invalid watermark scale: %s", args[4])
}
}
return nil
}