From 43d2db5e1501f8b966e0467e7c25049186af09e4 Mon Sep 17 00:00:00 2001 From: James South Date: Tue, 26 Aug 2014 22:24:47 +0100 Subject: [PATCH] Making is64 process public Former-commit-id: 36dae77a092f18afdbf1d7c260a8d3a50ecf647c --- .../Configuration/NativeBinaryFactory.cs | 13 ++++++++++++- .../images/output/rotate.jpg | Bin 17821 -> 18422 bytes .../Imaging/Formats/NativeMethods.cs | 8 +------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/ImageProcessor/Configuration/NativeBinaryFactory.cs b/src/ImageProcessor/Configuration/NativeBinaryFactory.cs index e210aa0362..16ab92261d 100644 --- a/src/ImageProcessor/Configuration/NativeBinaryFactory.cs +++ b/src/ImageProcessor/Configuration/NativeBinaryFactory.cs @@ -71,6 +71,17 @@ namespace ImageProcessor.Configuration this.Dispose(false); } + /// + /// Gets a value indicating whether the operating environment is 64 bit. + /// + public bool Is64BitEnvironment + { + get + { + return Is64Bit; + } + } + /// /// Registers any embedded native (unmanaged) binaries required by ImageProcessor. /// @@ -90,7 +101,7 @@ namespace ImageProcessor.Configuration b => { IntPtr pointer; - string folder = Is64Bit ? "x64" : "x86"; + string folder = Is64BitEnvironment ? "x64" : "x86"; Assembly assembly = Assembly.GetExecutingAssembly(); string targetBasePath = new Uri(assembly.Location).LocalPath; string targetPath = Path.GetFullPath(Path.Combine(targetBasePath, "..\\" + folder + "\\" + name)); diff --git a/src/ImageProcessorConsole/images/output/rotate.jpg b/src/ImageProcessorConsole/images/output/rotate.jpg index cafd5f805f911d22194506a9d0ad54bddcba961d..9e982a5ad461cd566d08e4882ddcdafa422ef5c1 100644 GIT binary patch delta 11302 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 delta 10696 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 Ph#x%e|G+@gnK1W%11*JG diff --git a/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/Imaging/Formats/NativeMethods.cs b/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/Imaging/Formats/NativeMethods.cs index 936b582560..a04c449233 100644 --- a/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/Imaging/Formats/NativeMethods.cs +++ b/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/Imaging/Formats/NativeMethods.cs @@ -22,18 +22,12 @@ namespace ImageProcessor.Plugins.WebP.Imaging.Formats /// internal static class NativeMethods { - /// - /// Whether the process is running in 64bit mode. Used for calling the correct method. - /// Clunky I know but I couldn't get dynamic methods to work. - /// - private static readonly bool Is64Bit = Environment.Is64BitProcess; - /// /// Initializes static members of the class. /// static NativeMethods() { - string folder = Is64Bit ? "x64" : "x86"; + string folder = ImageProcessorBootstrapper.Instance.NativeBinaryFactory.Is64BitEnvironment ? "x64" : "x86"; string name = string.Format("ImageProcessor.Plugins.WebP.Resources.Unmanaged.{0}.libwebp.dll", folder); Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(name);