Skip to content

Commit

Permalink
Update Sample 04 (Getting bitmap information) to .NET 4.7.2
Browse files Browse the repository at this point in the history 
(issue #8)
  • Loading branch information
@LordBenjamin
LordBenjamin committed Jan 17, 2019
1 parent 66a7eda commit 88b8e66
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 220 deletions.
10 changes: 7 additions & 3 deletions src/Samples/Sample 04 - Getting bitmap informations/MainForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Windows.Forms;
using FreeImageAPI;
using FreeImageNETUnitTest;

namespace Sample04
{
Expand All @@ -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());
}
Expand Down Expand Up @@ -117,4 +121,4 @@ private void bOpenFile_Click(object sender, EventArgs e)
}
}
}
}
}
16 changes: 0 additions & 16 deletions src/Samples/Sample 04 - Getting bitmap informations/Properties/AssemblyInfo.cs
View file

This file was deleted.

104 changes: 0 additions & 104 deletions ...mple 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.2005.csproj
View file

This file was deleted.

113 changes: 16 additions & 97 deletions ...es/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,109 +1,28 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1F4BCDD7-5BD9-4237-8B14-C52B2A9FF52A}</ProjectGuid>
<AssemblyTitle>Sample03</AssemblyTitle>
<TargetFrameworks>net472</TargetFrameworks>
<ApplicationIcon />
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sample04</RootNamespace>
<AssemblyName>Sample04</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>
</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>
</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<StartupObject />
<AssemblyName>Sample03</AssemblyName>
<RootNamespace>Sample03</RootNamespace>
</PropertyGroup>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Compile Include="..\..\UnitTest\NativeLibraryLoader.cs" Link="NativeLibraryLoader.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<ProjectReference Include="..\..\FreeImage.Standard\FreeImage.Standard.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="MainForm.resx">
<SubType>Designer</SubType>
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<Folder Include="Properties\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Library\Library.csproj">
<Project>{6598A7CD-8F27-4D3F-A675-5AE63113A7C3}</Project>
<Name>Library</Name>
</ProjectReference>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
31 changes: 31 additions & 0 deletions ...mples/Sample 04 - Getting bitmap informations/Sample 04 - Getting bitmap informations.sln
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 88b8e66

Please sign in to comment.