]> granicus.if.org Git - imagemagick/commitdiff
Minor refactoring.
authordirk <dirk@git.imagemagick.org>
Wed, 17 Dec 2014 16:11:01 +0000 (16:11 +0000)
committerdirk <dirk@git.imagemagick.org>
Wed, 17 Dec 2014 16:11:01 +0000 (16:11 +0000)
MagickCore/composite.c

index 1fe95b27f60f6d7145a9879c2401dd8d3fc387af..36e5225b6776042502ff1736be6a83b2a58849cf 100644 (file)
@@ -1372,9 +1372,10 @@ if (0)
               case SrcInCompositeOp:
               case SrcOutCompositeOp:
               {
-                pixel=(MagickRealType) q[i];
                 if (channel == AlphaPixelChannel)
                   pixel=(MagickRealType) TransparentAlpha;
+                else
+                  pixel=(MagickRealType) q[i];
                 break;
               }
               case ClearCompositeOp:
@@ -1383,23 +1384,19 @@ if (0)
               case SrcCompositeOp:
               {
                 if (channel == AlphaPixelChannel)
-                  {
-                    pixel=(MagickRealType) TransparentAlpha;
-                    break;
-                  }
-                pixel=0.0;
+                  pixel=(MagickRealType) TransparentAlpha;
+                else
+                  pixel=0.0;
                 break;
               }
               case BlendCompositeOp:
               case DissolveCompositeOp:
               {
                 if (channel == AlphaPixelChannel)
-                  {
-                    pixel=destination_dissolve*GetPixelAlpha(composite_image,
-                      source);
-                    break;
-                  }
-                pixel=(MagickRealType) source[channel];
+                  pixel=destination_dissolve*GetPixelAlpha(composite_image,
+                    source);
+                else
+                  pixel=(MagickRealType) source[channel];
                 break;
               }
               default: