Clenup some smell

imagemeta/heif.go

@@ -219,13 +219,10 @@ func heifReadBoxes(d *heifData, r io.Reader) error {
 				return err
 			}
 		case "meta":
-			if err := heifReadMeta(d, r, boxDataSize); err != nil {
-				return err
-			}
-			return nil
+			return heifReadMeta(d, r, boxDataSize)
 		case "hdlr":
 			if err := heifReadHldr(r, boxDataSize); err != nil {
-				return nil
+				return err
 			}
 		case "iprp", "ipco":
 			data, err := heifReadN(r, boxDataSize)

options/processing_options.go

@@ -272,9 +272,7 @@ func parseExtend(opts *ExtendOptions, name string, args []string) error {
 	opts.Enabled = parseBoolOption(args[0])
 
 	if len(args) > 1 {
-		if err := parseGravity(&opts.Gravity, name+" gravity", args[1:], extendGravityTypes); err != nil {
-			return err
-		}
+		return parseGravity(&opts.Gravity, name+" gravity", args[1:], extendGravityTypes)
 	}
 
 	return nil
@@ -436,11 +434,7 @@ func applyDprOption(po *ProcessingOptions, args []string) error {
 }
 
 func applyGravityOption(po *ProcessingOptions, args []string) error {
-	if err := parseGravity(&po.Gravity, "gravity", args, cropGravityTypes); err != nil {
-		return err
-	}
-
-	return nil
+	return parseGravity(&po.Gravity, "gravity", args, cropGravityTypes)
 }
 
 func applyCropOption(po *ProcessingOptions, args []string) error {
@@ -459,9 +453,7 @@ func applyCropOption(po *ProcessingOptions, args []string) error {
 	}
 
 	if len(args) > 2 {
-		if err := parseGravity(&po.Crop.Gravity, "crop gravity", args[2:], cropGravityTypes); err != nil {
-			return err
-		}
+		return parseGravity(&po.Crop.Gravity, "crop gravity", args[2:], cropGravityTypes)
 	}
 
 	return nil

processing/watermark.go

@@ -78,11 +78,7 @@ func prepareWatermark(wm *vips.Image, wmData *imagedata.ImageData, opts *options
 	}
 
 	// We don't want any headers to be copied from the watermark to the image
-	if err := wm.StripAll(); err != nil {
-		return err
-	}
-
-	return nil
+	return wm.StripAll()
 }
 
 func applyWatermark(img *vips.Image, wmData *imagedata.ImageData, opts *options.WatermarkOptions, offsetScale float64, framesCount int) error {