locate darktable

ImageMagick · Feb 15, 2024 · 90e3324 · 90e3324
1 parent 08e213c
commit 90e3324
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/coders/dng.c b/coders/dng.c
@@ -229,6 +229,9 @@ static Image *InvokeDNGDelegate(const ImageInfo *image_info,Image *image,
   ImageInfo
     *read_info;
 
+  MagickBooleanType
+    status;
+
   /*
     Convert DNG to TIFF with delegate program.
   */
@@ -237,16 +240,19 @@ static Image *InvokeDNGDelegate(const ImageInfo *image_info,Image *image,
   image=AcquireImage(image_info);
   read_info=CloneImageInfo(image_info);
   SetImageInfoBlob(read_info,(void *) NULL,0);
-  (void) InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception);
+  status=InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception);
   image=DestroyImage(image);
+  if (status == MagickFalse)
+    return(image);
+  *read_info->magick='\0';
   (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.tif",
     read_info->unique);
   sans_exception=AcquireExceptionInfo();
   image=ReadImage(read_info,sans_exception);
-  (void) RelinquishUniqueFileResource(read_info->filename);
   sans_exception=DestroyExceptionInfo(sans_exception);
   if (image != (Image *) NULL)
     (void) CopyMagickString(image->magick,read_info->magick,MagickPathExtent);
+  (void) RelinquishUniqueFileResource(read_info->filename);
   read_info=DestroyImageInfo(read_info);
   return(image);
 }

diff --git a/configure b/configure
@@ -5137,7 +5137,7 @@ MAGICK_PATCHLEVEL_VERSION=7
 
 MAGICK_VERSION=6.9.13-7
 
-MAGICK_GIT_REVISION=476beb52a:20240211
+MAGICK_GIT_REVISION=08e213c65:20240214
 
 
 # Substitute library versioning
@@ -5171,7 +5171,7 @@ PACKAGE_LIB_VERSION=0x69D
 
 PACKAGE_LIB_VERSION_NUMBER=6,9,13,7
 
-PACKAGE_RELEASE_DATE=2024-02-11
+PACKAGE_RELEASE_DATE=2024-02-14
 
 
 # Ensure that make can run correctly
@@ -34673,7 +34673,7 @@ BPGDecodeDelegateDefault='bpgdec'
 BPGEncodeDelegateDefault='bpgenc'
 BlenderDecodeDelegateDefault='blender'
 BrowseDelegateDefault='xdg-open'
-DNGDecodeDelegateDefault='ufraw-batch'
+DNGDecodeDelegateDefault='darktable-cli'
 DOCDecodeDelegateDefault='libreoffice'
 GVCDecodeDelegateDefault='dot'
 DVIDecodeDelegateDefault='dvips'

diff --git a/configure.ac b/configure.ac
@@ -3140,7 +3140,7 @@ BPGDecodeDelegateDefault='bpgdec'
 BPGEncodeDelegateDefault='bpgenc'
 BlenderDecodeDelegateDefault='blender'
 BrowseDelegateDefault='xdg-open'
-DNGDecodeDelegateDefault='ufraw-batch'
+DNGDecodeDelegateDefault='darktable-cli'
 DOCDecodeDelegateDefault='libreoffice'
 GVCDecodeDelegateDefault='dot'
 DVIDecodeDelegateDefault='dvips'