diff --git a/src/Samples/Sample 04 - Getting bitmap informations/MainForm.cs b/src/Samples/Sample 04 - Getting bitmap informations/MainForm.cs index dff68f3..32751b4 100644 --- a/src/Samples/Sample 04 - Getting bitmap informations/MainForm.cs +++ b/src/Samples/Sample 04 - Getting bitmap informations/MainForm.cs @@ -1,6 +1,7 @@ using System; using System.Windows.Forms; using FreeImageAPI; +using FreeImageNETUnitTest; namespace Sample04 { @@ -10,8 +11,11 @@ public partial class MainForm : Form [STAThread] static void Main() - { - Application.EnableVisualStyles(); + { + NativeLibraryLoader.CopyFreeImageNativeDll(); + FreeImage.ValidateAvailability(); + + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new MainForm()); } @@ -117,4 +121,4 @@ private void bOpenFile_Click(object sender, EventArgs e) } } } -} \ No newline at end of file +} diff --git a/src/Samples/Sample 04 - Getting bitmap informations/Properties/AssemblyInfo.cs b/src/Samples/Sample 04 - Getting bitmap informations/Properties/AssemblyInfo.cs deleted file mode 100644 index c14bca6..0000000 --- a/src/Samples/Sample 04 - Getting bitmap informations/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("7c8fdc9a-a8f9-4996-99c8-9df47513edeb")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.2005.csproj b/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.2005.csproj deleted file mode 100644 index a2cb27b..0000000 --- a/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.2005.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {1F4BCDD7-5BD9-4237-8B14-C52B2A9FF52A} - WinExe - Properties - Sample04 - Sample04 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - none - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\Debug\ - DEBUG;TRACE - full - x86 - false - prompt - - - bin\Release\ - TRACE - true - - - x86 - false - prompt - - - true - bin\Debug\ - DEBUG;TRACE - full - x64 - false - prompt - - - bin\Release\ - TRACE - true - - - x64 - false - prompt - - - - - - - - - Form - - - MainForm.cs - - - - - - Designer - MainForm.cs - - - - - {6598A7CD-8F27-4D3F-A675-5AE63113A7C3} - Library - - - - - \ No newline at end of file diff --git a/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.csproj b/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.csproj index 0504da7..5aae83e 100644 --- a/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.csproj +++ b/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.csproj @@ -1,109 +1,28 @@ - + + - Debug - AnyCPU - 8.0.50727 - 2.0 - {1F4BCDD7-5BD9-4237-8B14-C52B2A9FF52A} + Sample03 + net472 + WinExe - Properties - Sample04 - Sample04 - - - 2.0 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - none - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\Debug\ - DEBUG;TRACE - full - x86 - false - prompt - - - bin\Release\ - TRACE - true - - - x86 - false - prompt - - - true - bin\Debug\ - DEBUG;TRACE - full - x64 - false - prompt - - - bin\Release\ - TRACE - true - - - x64 - false - prompt + + Sample03 + Sample03 + - - - + + - - Form - - - MainForm.cs - - + + - - Designer - MainForm.cs - + + - - {6598A7CD-8F27-4D3F-A675-5AE63113A7C3} - Library - + - - \ No newline at end of file diff --git a/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.sln b/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.sln new file mode 100644 index 0000000..c6edc28 --- /dev/null +++ b/src/Samples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample 04 - Getting bitmap informations", "Sample 04 - Getting bitmap informations.csproj", "{3B55D913-1E30-4DBD-8D0F-969AEC6DF7D9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeImage.Standard", "..\..\FreeImage.Standard\FreeImage.Standard.csproj", "{85E2DD65-ECD9-4E2B-AC8B-8A785C5B81D9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3B55D913-1E30-4DBD-8D0F-969AEC6DF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B55D913-1E30-4DBD-8D0F-969AEC6DF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B55D913-1E30-4DBD-8D0F-969AEC6DF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B55D913-1E30-4DBD-8D0F-969AEC6DF7D9}.Release|Any CPU.Build.0 = Release|Any CPU + {85E2DD65-ECD9-4E2B-AC8B-8A785C5B81D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85E2DD65-ECD9-4E2B-AC8B-8A785C5B81D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85E2DD65-ECD9-4E2B-AC8B-8A785C5B81D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85E2DD65-ECD9-4E2B-AC8B-8A785C5B81D9}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2290359D-77BA-4EB9-BB81-F3AD42837BB7} + EndGlobalSection +EndGlobal