http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26900

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 8ed2232bd06262b0ee9125bdea54af6724a2e6fe..d5de5210dc0404f6f65a4be3815757dd285a2ebd 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1219,11 +1219,11 @@ if (0)
 
     MagickRealType
       blue,
-      luma,
+      chroma,
       green,
       hue,
-      red,
-      chroma;
+      luma,
+      red;
 
     PixelInfo
       canvas_pixel,
@@ -1369,8 +1369,7 @@ if (0)
               case DissolveCompositeOp:
               {
                 if (channel == AlphaPixelChannel)
-                  pixel=canvas_dissolve*GetPixelAlpha(source_image,
-                    source);
+                  pixel=canvas_dissolve*GetPixelAlpha(source_image,source);
                 else
                   pixel=(MagickRealType) source[channel];
                 break;

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 10faf75bfccc2efcc69492bb287b6b517a464936..17e687387e7a2e794f4821d8dc15b0366b50e977 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -86,7 +86,7 @@ static const char
     "  <delegate decode=\"avi:decode\" stealth=\"True\" command=\"&quot;mplayer&quot; &quot;%i&quot; -really-quiet -ao null -vo png:z=3\"/>"
     "  <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\"&quot;xdg-open&quot; http://www.imagemagick.org/; rm &quot;%i&quot;\"/>"
     "  <delegate decode=\"cgm\" thread-support=\"False\" command=\"&quot;ralcgm&quot; -d ps -oC &lt; &quot;%i&quot; &gt; &quot;%o&quot; 2&gt; &quot;%u&quot;\"/>"
-    "  <delegate decode=\"dng:decode\" command=\"&quot;/usr/bin/ufraw-batch&quot; --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 &quot;--output=%u.pnm&quot; &quot;%i&quot;\"/>"
+    "  <delegate decode=\"dng:decode\" command=\"&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;\"/>"
     "  <delegate decode=\"edit\" stealth=\"True\" command=\"&quot;xterm&quot; -title &quot;Edit Image Comment&quot; -e vi &quot;%o&quot;\"/>"
     "  <delegate decode=\"eps\" encode=\"pdf\" mode=\"bi\" command=\"&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;\"/>"
     "  <delegate decode=\"eps\" encode=\"ps\" mode=\"bi\" command=\"&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ps2write&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;\"/>"