Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Olena
pylene
Commits
ab582c96
Commit
ab582c96
authored
Mar 21, 2018
by
Michaël Roynard
Browse files
Fix minor windows compilation change
parent
f94a4425
Changes
2
Hide whitespace changes
Inline
Side-by-side
mln/core/image/ndimage.hpp
View file @
ab582c96
...
...
@@ -774,7 +774,7 @@ namespace mln
q
.
rem
+=
static_cast
<
int
>
(
m_index_strides
[
i
]);
q
.
quot
-=
1
;
}
p
[
i
]
+=
q
.
quot
;
p
[
i
]
+=
static_cast
<
short
>
(
q
.
quot
)
;
diff
=
q
.
rem
;
}
...
...
tests/core/image/image_ops.cpp
View file @
ab582c96
...
...
@@ -99,8 +99,6 @@ TEST(Core, Image2d_WhereOperator)
auto
f4
=
where
(
x
>
12
,
(
uint8
)
0
,
(
uint8
)
1
);
// RValue image + Scalar + Scalar
ASSERT_TRUE
(
all
(
f1
>=
12
));
// MSVC : uint8&, clang/gcc : const uint8&
ASSERT_TRUE
((
std
::
is_same
<
mln_reference
(
decltype
(
f1
)),
const
uint8
&>
()
||
std
::
is_same
<
mln_reference
(
decltype
(
f1
)),
uint8
&>
()));
ASSERT_TRUE
((
std
::
is_same
<
mln_reference
(
decltype
(
f1
)),
const
uint8
&>
()));
ASSERT_TRUE
((
std
::
is_same
<
mln_reference
(
decltype
(
f2
)),
uint8
&>
()));
}
Write
Preview
Supports
Markdown
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