소스 검색

Fix watermarks

DarthSim 1 주 전
부모
커밋
af63aba7a4
2개의 변경된 파일1개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 4
      processing/pipeline.go
  2. 1 1
      processing/watermark.go

+ 0 - 4
processing/pipeline.go

@@ -3,7 +3,6 @@ package processing
 import (
 	"context"
 
-	"github.com/imgproxy/imgproxy/v3/auximageprovider"
 	"github.com/imgproxy/imgproxy/v3/imagedata"
 	"github.com/imgproxy/imgproxy/v3/options"
 	"github.com/imgproxy/imgproxy/v3/security"
@@ -27,9 +26,6 @@ type Context struct {
 	// Original image data
 	ImgData imagedata.ImageData
 
-	// The watermark image provider, if any watermarking is to be done.
-	WatermarkProvider auximageprovider.Provider
-
 	SrcWidth  int
 	SrcHeight int
 	Angle     int

+ 1 - 1
processing/watermark.go

@@ -212,7 +212,7 @@ func (p *Processor) applyWatermark(
 }
 
 func (p *Processor) watermark(c *Context) error {
-	if c.WatermarkProvider == nil || c.PO.WatermarkOpacity() == 0 {
+	if p.watermarkProvider == nil || c.PO.WatermarkOpacity() == 0 {
 		return nil
 	}