Skip to content

Commit

Permalink
Windows 10 RTM Release - June 2016 Update 2
Browse files Browse the repository at this point in the history
  • Loading branch information
oldnewthing committed Jun 9, 2016
1 parent 259ad12 commit 99c24d0
Show file tree
Hide file tree
Showing 32 changed files with 797 additions and 889 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
taskRegistration.addEventListener("completed", onBackgroundTaskCompleted, false);

// Even though the trigger is registered successfully, it might be blocked. Notify the user if that is the case.
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Denied) ||
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Unspecified)) {
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.denied) ||
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.unspecified)) {
WinJS.log && WinJS.log("Not able to run in background. Application must given permission to be added to lock screen.",
"sample", "error");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@
taskRegistration.addEventListener("completed", onBackgroundTaskCompleted, false);

// Even though the trigger is registered successfully, it might be blocked. Notify the user if that is the case.
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Denied) ||
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Unspecified)) {
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.denied) ||
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.unspecified)) {
WinJS.log && WinJS.log("Not able to run in background. Application must given permission to be added to lock screen.",
"sample", "error");
}
Expand Down
2 changes: 1 addition & 1 deletion Samples/CameraHdr/cpp/MainPage.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ void MainPage::AdvancedCapture_OptionalReferencePhotoCaptured(Capture::AdvancedP
fileName << context->CaptureFileName->Data();
StringReplace(fileName.str(), std::wstring(L"_HDR"), std::wstring(L""));

ReencodeAndSavePhotoAsync(args->Frame, ref new String(fileName.str().c_str()), context->CptureOrientation);
ReencodeAndSavePhotoAsync(args->Frame, ref new String(fileName.str().c_str()), context->CaptureOrientation);
}

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions Samples/D2DGradientMesh/cpp/D2DGradientMesh.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -117,7 +117,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -129,7 +129,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -153,7 +153,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -165,7 +165,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand Down
16 changes: 8 additions & 8 deletions Samples/Geotag/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@

# Geotag sample

This sample demonstrates Windows.Storage.FileProperties.GeotagHelper API usage
This sample demonstrates the GeotagHelper runtime class.

Specifically, this sample covers:

Scenario 1: Demonstrates using GetGeotagAsync API to retrieve location info from a file.
Also demostrates using SetGeotagAsync API to geotag a file with known location
info, and using SetGeotagFromGeolocatorAsync API to geotag a file with current
device location info provided by location framework.
- Read geotag information from a file.
- Set a file's geotag information to a specific location.
- Set a file's geotag information to the location obtained from a Geolocator.

Related topics
--------------
[Known Folders](https://msdn.microsoft.com/library/windows/apps/windows.storage.knownfolders.aspx)
[GeotagHelper class](https://msdn.microsoft.com/library/windows/apps/windows.storage.fileproperties.geotaghelper.aspx)

[Geolocator class](https://msdn.microsoft.com/library/windows/apps/windows.devices.geolocation.geolocator.aspx)

[Geolocation sample](/Samples/Geolocation)

System requirements
-------------------
Expand Down
6 changes: 3 additions & 3 deletions Samples/Geotag/cpp/Geotag.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</ClInclude>
<ClInclude Include="SampleConfiguration.h" />
<ClInclude Include="Scenario1_Geotag.xaml.h">
<DependentUpon>Scenario1_Geotag.xaml</DependentUpon>
<DependentUpon>..\shared\Scenario1_Geotag.xaml</DependentUpon>
</ClInclude>
</ItemGroup>
<ItemGroup>
Expand All @@ -159,7 +159,7 @@
<Page Include="..\..\..\SharedContent\cpp\MainPage.xaml">
<SubType>Designer</SubType>
</Page>
<Page Include="Scenario1_Geotag.xaml" />
<Page Include="..\shared\Scenario1_Geotag.xaml" />
<Page Include="..\..\..\SharedContent\xaml\Styles.xaml">
<Link>Styles\Styles.xaml</Link>
</Page>
Expand All @@ -186,7 +186,7 @@
</ClCompile>
<ClCompile Include="SampleConfiguration.cpp" />
<ClCompile Include="Scenario1_Geotag.xaml.cpp">
<DependentUpon>Scenario1_Geotag.xaml</DependentUpon>
<DependentUpon>..\shared\Scenario1_Geotag.xaml</DependentUpon>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Geotag/cpp/Geotag.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</ItemGroup>
<ItemGroup>
<Page Include="..\..\..\SharedContent\cpp\MainPage.xaml" />
<Page Include="Scenario1_Geotag.xaml" />
<Page Include="..\shared\Scenario1_Geotag.xaml" />
<Page Include="..\..\..\SharedContent\xaml\Styles.xaml">
<Filter>Styles</Filter>
</Page>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Geotag/cpp/SampleConfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ using namespace SDKTemplate;

Platform::Array<Scenario>^ MainPage::scenariosInner = ref new Platform::Array<Scenario>
{
{ "Geotag CPP Sample", "GeotagCPPSample.Scenario1_Geotag" }
{ "Geotag a file", "SDKTemplate.Scenario1_Geotag" }
};
43 changes: 0 additions & 43 deletions Samples/Geotag/cpp/Scenario1_Geotag.xaml

This file was deleted.

Loading

0 comments on commit 99c24d0

Please sign in to comment.