Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
eos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Richard Torenvliet
eos
Commits
e7294cd1
Commit
e7294cd1
authored
Aug 23, 2015
by
Patrik Huber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile errors on Clang/gcc
parent
b48d1ebb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
include/eos/fitting/nonlinear_camera_estimation.hpp
include/eos/fitting/nonlinear_camera_estimation.hpp
+2
-2
include/eos/render/utils.hpp
include/eos/render/utils.hpp
+0
-1
No files found.
include/eos/fitting/nonlinear_camera_estimation.hpp
View file @
e7294cd1
...
@@ -208,8 +208,8 @@ OrthographicRenderingParameters estimate_orthographic_camera(std::vector<cv::Vec
...
@@ -208,8 +208,8 @@ OrthographicRenderingParameters estimate_orthographic_camera(std::vector<cv::Vec
auto
info
=
lm
.
minimize
(
parameters
);
// we could or should use the return value
auto
info
=
lm
.
minimize
(
parameters
);
// we could or should use the return value
// 'parameters' contains the solution now.
// 'parameters' contains the solution now.
Frustum
camera_frustum
{
-
1.0
f
*
aspect
*
parameters
[
5
],
1.0
f
*
aspect
*
parameters
[
5
],
-
1.0
f
*
parameters
[
5
],
1.0
f
*
parameters
[
5
]
};
Frustum
camera_frustum
{
-
1.0
f
*
aspect
*
static_cast
<
float
>
(
parameters
[
5
]),
1.0
f
*
aspect
*
static_cast
<
float
>
(
parameters
[
5
]),
-
1.0
f
*
static_cast
<
float
>
(
parameters
[
5
]),
1.0
f
*
static_cast
<
float
>
(
parameters
[
5
])
};
return
RenderingParameters
{
static_cast
<
float
>
(
parameters
[
0
]),
static_cast
<
float
>
(
parameters
[
1
]),
static_cast
<
float
>
(
parameters
[
2
]),
static_cast
<
float
>
(
parameters
[
3
]),
static_cast
<
float
>
(
parameters
[
4
]),
camera_frustum
};
return
Orthographic
RenderingParameters
{
static_cast
<
float
>
(
parameters
[
0
]),
static_cast
<
float
>
(
parameters
[
1
]),
static_cast
<
float
>
(
parameters
[
2
]),
static_cast
<
float
>
(
parameters
[
3
]),
static_cast
<
float
>
(
parameters
[
4
]),
camera_frustum
};
};
};
}
/* namespace fitting */
}
/* namespace fitting */
...
...
include/eos/render/utils.hpp
View file @
e7294cd1
...
@@ -214,7 +214,6 @@ Texture create_mipmapped_texture(cv::Mat image, unsigned int mipmapsNum = 0) {
...
@@ -214,7 +214,6 @@ Texture create_mipmapped_texture(cv::Mat image, unsigned int mipmapsNum = 0) {
return
texture
;
return
texture
;
};
};
};
}
/* namespace render */
}
/* namespace render */
}
/* namespace eos */
}
/* namespace eos */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment