Skip to content
Snippets Groups Projects
Commit adafd963 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

win32: fix filter_transpose for native windows build

Change-Id: I859348239f76c2830389ae625a8bc7bb5d3d4dfa
parent 4bb6426c
No related branches found
No related tags found
No related merge requests found
...@@ -771,6 +771,7 @@ ...@@ -771,6 +771,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\media\video\filter_transpose.cpp" />
<ClCompile Include="..\src\media\video\sinkclient.cpp" /> <ClCompile Include="..\src\media\video\sinkclient.cpp" />
<ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp"> <ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
...@@ -935,6 +936,7 @@ ...@@ -935,6 +936,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\media\video\filter_transpose.h" />
<ClInclude Include="..\src\media\video\shm_header.h" /> <ClInclude Include="..\src\media\video\shm_header.h" />
<ClInclude Include="..\src\media\video\sinkclient.h" /> <ClInclude Include="..\src\media\video\sinkclient.h" />
<ClInclude Include="..\src\media\video\video_base.h" /> <ClInclude Include="..\src\media\video\video_base.h" />
......
...@@ -406,6 +406,9 @@ ...@@ -406,6 +406,9 @@
<ClCompile Include="..\src\media\audio\audio_frame_resizer.cpp"> <ClCompile Include="..\src\media\audio\audio_frame_resizer.cpp">
<Filter>Source Files\media\audio</Filter> <Filter>Source Files\media\audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\media\video\filter_transpose.cpp">
<Filter>Source Files\media\video</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\account.h"> <ClInclude Include="..\src\account.h">
...@@ -834,6 +837,9 @@ ...@@ -834,6 +837,9 @@
<ClInclude Include="..\src\media\audio\audio_frame_resizer.h"> <ClInclude Include="..\src\media\audio\audio_frame_resizer.h">
<Filter>Source Files\media\audio</Filter> <Filter>Source Files\media\audio</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\media\video\filter_transpose.h">
<Filter>Source Files\media\video</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\src\ringdht\eth\libdevcore\Makefile.am"> <None Include="..\src\ringdht\eth\libdevcore\Makefile.am">
......
...@@ -28,7 +28,11 @@ std::unique_ptr<MediaFilter> ...@@ -28,7 +28,11 @@ std::unique_ptr<MediaFilter>
getTransposeFilter(int rotation, std::string inputName, int width, int height, int format, bool rescale) getTransposeFilter(int rotation, std::string inputName, int width, int height, int format, bool rescale)
{ {
JAMI_WARN("Rotation set to %d", rotation); JAMI_WARN("Rotation set to %d", rotation);
#ifdef _MSC_VER
if (_isnan(rotation) || !rotation) {
#else
if (std::isnan(rotation) || !rotation) { if (std::isnan(rotation) || !rotation) {
#endif
return {}; return {};
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment