Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
adafd963
Commit
adafd963
authored
6 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
win32: fix filter_transpose for native windows build
Change-Id: I859348239f76c2830389ae625a8bc7bb5d3d4dfa
parent
4bb6426c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
MSVC/ring-daemon.vcxproj
+2
-0
2 additions, 0 deletions
MSVC/ring-daemon.vcxproj
MSVC/ring-daemon.vcxproj.filters
+6
-0
6 additions, 0 deletions
MSVC/ring-daemon.vcxproj.filters
src/media/video/filter_transpose.cpp
+4
-0
4 additions, 0 deletions
src/media/video/filter_transpose.cpp
with
12 additions
and
0 deletions
MSVC/ring-daemon.vcxproj
+
2
−
0
View file @
adafd963
...
...
@@ -771,6 +771,7 @@
<ExcludedFromBuild
Condition=
"'$(Configuration)|$(Platform)'=='ReleaseLib|x64'"
>
true
</ExcludedFromBuild>
<ExcludedFromBuild
Condition=
"'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'"
>
true
</ExcludedFromBuild>
</ClCompile>
<ClCompile
Include=
"..\src\media\video\filter_transpose.cpp"
/>
<ClCompile
Include=
"..\src\media\video\sinkclient.cpp"
/>
<ClCompile
Include=
"..\src\media\video\uwpvideo\video_device_impl.cpp"
>
<ExcludedFromBuild
Condition=
"'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'"
>
true
</ExcludedFromBuild>
...
...
@@ -935,6 +936,7 @@
<ExcludedFromBuild
Condition=
"'$(Configuration)|$(Platform)'=='ReleaseLib|x64'"
>
true
</ExcludedFromBuild>
<ExcludedFromBuild
Condition=
"'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'"
>
true
</ExcludedFromBuild>
</ClInclude>
<ClInclude
Include=
"..\src\media\video\filter_transpose.h"
/>
<ClInclude
Include=
"..\src\media\video\shm_header.h"
/>
<ClInclude
Include=
"..\src\media\video\sinkclient.h"
/>
<ClInclude
Include=
"..\src\media\video\video_base.h"
/>
...
...
This diff is collapsed.
Click to expand it.
MSVC/ring-daemon.vcxproj.filters
+
6
−
0
View file @
adafd963
...
...
@@ -406,6 +406,9 @@
<ClCompile
Include=
"..\src\media\audio\audio_frame_resizer.cpp"
>
<Filter>
Source Files\media\audio
</Filter>
</ClCompile>
<ClCompile
Include=
"..\src\media\video\filter_transpose.cpp"
>
<Filter>
Source Files\media\video
</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\src\account.h"
>
...
...
@@ -834,6 +837,9 @@
<ClInclude
Include=
"..\src\media\audio\audio_frame_resizer.h"
>
<Filter>
Source Files\media\audio
</Filter>
</ClInclude>
<ClInclude
Include=
"..\src\media\video\filter_transpose.h"
>
<Filter>
Source Files\media\video
</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None
Include=
"..\src\ringdht\eth\libdevcore\Makefile.am"
>
...
...
This diff is collapsed.
Click to expand it.
src/media/video/filter_transpose.cpp
+
4
−
0
View file @
adafd963
...
...
@@ -28,7 +28,11 @@ std::unique_ptr<MediaFilter>
getTransposeFilter
(
int
rotation
,
std
::
string
inputName
,
int
width
,
int
height
,
int
format
,
bool
rescale
)
{
JAMI_WARN
(
"Rotation set to %d"
,
rotation
);
#ifdef _MSC_VER
if
(
_isnan
(
rotation
)
||
!
rotation
)
{
#else
if
(
std
::
isnan
(
rotation
)
||
!
rotation
)
{
#endif
return
{};
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment