diff --git a/process.go b/process.go index 8299d7c0..98a35e07 100644 --- a/process.go +++ b/process.go @@ -609,7 +609,7 @@ func saveImageToFitBytes(po *processingOptions, img *vipsImage) ([]byte, context img.CopyMemory() for { - result, cancel, err := img.Save(po.Format, quality, po.StripMetadata) + result, cancel, err := img.Save(po.Format, quality, conf.StripMetadata) if len(result) <= po.MaxBytes || quality <= 10 || err != nil { return result, cancel, err } @@ -737,5 +737,5 @@ func processImage(ctx context.Context) ([]byte, context.CancelFunc, error) { return saveImageToFitBytes(po, img) } - return img.Save(po.Format, po.Quality, po.StripMetadata) + return img.Save(po.Format, po.Quality, conf.StripMetadata) } diff --git a/processing_options.go b/processing_options.go index df7b99e4..a66337a5 100644 --- a/processing_options.go +++ b/processing_options.go @@ -114,23 +114,22 @@ type watermarkOptions struct { } type processingOptions struct { - ResizingType resizeType - Width int - Height int - Dpr float64 - Gravity gravityOptions - Enlarge bool - Extend extendOptions - Crop cropOptions - Trim trimOptions - Format imageType - Quality int - StripMetadata bool - MaxBytes int - Flatten bool - Background rgbColor - Blur float32 - Sharpen float32 + ResizingType resizeType + Width int + Height int + Dpr float64 + Gravity gravityOptions + Enlarge bool + Extend extendOptions + Crop cropOptions + Trim trimOptions + Format imageType + Quality int + MaxBytes int + Flatten bool + Background rgbColor + Blur float32 + Sharpen float32 CacheBuster string @@ -199,22 +198,21 @@ var ( func newProcessingOptions() *processingOptions { newProcessingOptionsOnce.Do(func() { _newProcessingOptions = processingOptions{ - ResizingType: resizeFit, - Width: 0, - Height: 0, - Gravity: gravityOptions{Type: gravityCenter}, - Enlarge: false, - Extend: extendOptions{Enabled: false, Gravity: gravityOptions{Type: gravityCenter}}, - Trim: trimOptions{Enabled: false, Threshold: 10}, - Quality: conf.Quality, - StripMetadata: conf.StripMetadata, - MaxBytes: 0, - Format: imageTypeUnknown, - Background: rgbColor{255, 255, 255}, - Blur: 0, - Sharpen: 0, - Dpr: 1, - Watermark: watermarkOptions{Opacity: 1, Replicate: false, Gravity: gravityOptions{Type: gravityCenter}}, + ResizingType: resizeFit, + Width: 0, + Height: 0, + Gravity: gravityOptions{Type: gravityCenter}, + Enlarge: false, + Extend: extendOptions{Enabled: false, Gravity: gravityOptions{Type: gravityCenter}}, + Trim: trimOptions{Enabled: false, Threshold: 10}, + Quality: conf.Quality, + MaxBytes: 0, + Format: imageTypeUnknown, + Background: rgbColor{255, 255, 255}, + Blur: 0, + Sharpen: 0, + Dpr: 1, + Watermark: watermarkOptions{Opacity: 1, Replicate: false, Gravity: gravityOptions{Type: gravityCenter}}, } })