]> granicus.if.org Git - imagemagick/commitdiff
Fixed reading UTF8 path names under Windows.
authorDirk Lemstra <dirk@git.imagemagick.org>
Thu, 20 Jul 2017 21:54:51 +0000 (23:54 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Thu, 20 Jul 2017 21:54:51 +0000 (23:54 +0200)
coders/dng.c

index 1e1267817edbcd2422fd7127d454af51713c56ee..f17f31b93424b0b2a08586389922731f28636ef1 100644 (file)
@@ -211,7 +211,18 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
           libraw_strerror(errcode),"`%s'",image->filename);
         return(DestroyImageList(image));
       }
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && defined(_MSC_VER) && (_MSC_VER > 1310)
+    {
+      wchar_t
+        fileName[MagickPathExtent];
+
+      MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,
+        MagickPathExtent);
+      errcode=libraw_open_wfile(raw_info,fileName);
+    }
+#else
     errcode=libraw_open_file(raw_info,image->filename);
+#endif
     if (errcode != LIBRAW_SUCCESS)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),CoderError,