Ver Fonte

Pass options.Options to processing.NewGravityOptions

DarthSim há 1 semana atrás
pai
commit
da1eb3e242
2 ficheiros alterados com 6 adições e 6 exclusões
  1. 2 2
      processing/gravity.go
  2. 4 4
      processing/options.go

+ 2 - 2
processing/gravity.go

@@ -56,9 +56,9 @@ type GravityOptions struct {
 // It fills the [GravityOptions] struct with the options values under the given prefix.
 // If the gravity type is not set in the options,
 // it returns a [GravityOptions] with the provided default type.
-func NewGravityOptions(o ProcessingOptions, prefix string, defType options.GravityType) GravityOptions {
+func NewGravityOptions(o *options.Options, prefix string, defType options.GravityType) GravityOptions {
 	gr := GravityOptions{
-		Type: options.Get(o.Options, prefix+keys.SuffixType, defType),
+		Type: options.Get(o, prefix+keys.SuffixType, defType),
 		X:    o.GetFloat(prefix+keys.SuffixXOffset, 0.0),
 		Y:    o.GetFloat(prefix+keys.SuffixYOffset, 0.0),
 	}

+ 4 - 4
processing/options.go

@@ -66,7 +66,7 @@ func (po ProcessingOptions) Enlarge() bool {
 }
 
 func (po ProcessingOptions) Gravity() GravityOptions {
-	return NewGravityOptions(po, keys.Gravity, options.GravityCenter)
+	return NewGravityOptions(po.Options, keys.Gravity, options.GravityCenter)
 }
 
 func (po ProcessingOptions) ExtendEnabled() bool {
@@ -74,7 +74,7 @@ func (po ProcessingOptions) ExtendEnabled() bool {
 }
 
 func (po ProcessingOptions) ExtendGravity() GravityOptions {
-	return NewGravityOptions(po, keys.ExtendGravity, options.GravityCenter)
+	return NewGravityOptions(po.Options, keys.ExtendGravity, options.GravityCenter)
 }
 
 func (po ProcessingOptions) ExtendAspectRatioEnabled() bool {
@@ -82,7 +82,7 @@ func (po ProcessingOptions) ExtendAspectRatioEnabled() bool {
 }
 
 func (po ProcessingOptions) ExtendAspectRatioGravity() GravityOptions {
-	return NewGravityOptions(po, keys.ExtendAspectRatioGravity, options.GravityCenter)
+	return NewGravityOptions(po.Options, keys.ExtendAspectRatioGravity, options.GravityCenter)
 }
 
 func (po ProcessingOptions) Rotate() int {
@@ -102,7 +102,7 @@ func (po ProcessingOptions) CropHeight() float64 {
 }
 
 func (po ProcessingOptions) CropGravity() GravityOptions {
-	return NewGravityOptions(po, keys.CropGravity, options.GravityUnknown)
+	return NewGravityOptions(po.Options, keys.CropGravity, options.GravityUnknown)
 }
 
 func (po ProcessingOptions) Format() imagetype.Type {