Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
213
Issues
213
List
Boards
Labels
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
538cd502
Commit
538cd502
authored
Jul 04, 2019
by
Victor Poughon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: !A || (A && B) is equivalent to !A || B
parent
aceeb2aa
Pipeline
#2112
failed with stages
in 5 minutes and 3 seconds
Changes
3
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
...tion/DisparityMap/include/otbDisparityMapMedianFilter.hxx
+2
-2
Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
...arityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
+2
-2
Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
.../DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
+6
-6
No files found.
Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
View file @
538cd502
...
...
@@ -260,7 +260,7 @@ DisparityMapMedianFilter< TInputImage, TOutputImage, TMask>
InputIt
.
SetLocation
(
outputIt
.
GetIndex
());
for
(
unsigned
int
i
=
0
;
i
<
InputIt
.
Size
();
i
++
)
{
if
(
!
inputmaskPtr
||
(
inputmaskPtr
&&
MaskInputIt
.
GetPixel
(
i
)
!=
0
))
if
(
!
inputmaskPtr
||
(
MaskInputIt
.
GetPixel
(
i
)
!=
0
))
{
p
++
;
pixels
.
push_back
(
InputIt
.
GetPixel
(
i
));
...
...
@@ -347,7 +347,7 @@ DisparityMapMedianFilter< TInputImage, TOutputImage, TMask>
MaskInputIt
.
SetLocation
(
outputIt
.
GetIndex
());
}
if
((
!
inputmaskPtr
||
(
inputmaskPtr
&&
MaskInputIt
.
GetCenterPixel
()
!=
0
))
&&
if
((
!
inputmaskPtr
||
(
MaskInputIt
.
GetCenterPixel
()
!=
0
))
&&
std
::
fabs
(
InputIt
.
GetCenterPixel
()
-
MedianIt
.
Get
())
>
m_IncoherenceThreshold
)
{
outputDisparityMapIt
.
Set
(
0.0
);
//Remove pixel from disparity map//
...
...
Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
View file @
538cd502
...
...
@@ -670,9 +670,9 @@ TOutputDisparityImage,TMaskImage,TBlockMatchingFunctor>
((
tmpIndex
[
1
]
-
this
->
m_GridIndex
[
1
]
+
this
->
m_Step
)
%
this
->
m_Step
==
0
))
{
// If the mask is present and valid
if
(
!
inLeftMaskPtr
||
(
inLeftMask
Ptr
&&
inLeftMask
It
.
Get
()
>
0
)
)
if
(
!
inLeftMaskPtr
||
(
inLeftMaskIt
.
Get
()
>
0
)
)
{
if
(
!
inRightMaskPtr
||
(
inRightMask
Ptr
&&
inRightMask
It
.
Get
()
>
0
)
)
if
(
!
inRightMaskPtr
||
(
inRightMaskIt
.
Get
()
>
0
)
)
{
int
estimatedMinHDisp
=
m_MinimumHorizontalDisparity
;
int
estimatedMinVDisp
=
m_MinimumVerticalDisparity
;
...
...
Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
View file @
538cd502
...
...
@@ -762,9 +762,9 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
inRightMaskIt
.
SetIndex
(
curRightPos
);
}
// check that the current positions are not masked
if
(
!
inLeftMaskPtr
||
(
inLeftMask
Ptr
&&
inLeftMask
It
.
Get
()
>
0
)
)
if
(
!
inLeftMaskPtr
||
(
inLeftMaskIt
.
Get
()
>
0
)
)
{
if
(
!
inRightMaskPtr
||
(
inRightMask
Ptr
&&
inRightMask
It
.
Get
()
>
0
)
)
if
(
!
inRightMaskPtr
||
(
inRightMaskIt
.
Get
()
>
0
)
)
{
RegionType
smallRightRegion
;
smallRightRegion
.
SetIndex
(
0
,
curRightPos
[
0
]
-
1
);
...
...
@@ -1195,9 +1195,9 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
inRightMaskIt
.
SetIndex
(
curRightPos
);
}
// check that the current positions are not masked
if
(
!
inLeftMaskPtr
||
(
inLeftMask
Ptr
&&
inLeftMask
It
.
Get
()
>
0
)
)
if
(
!
inLeftMaskPtr
||
(
inLeftMaskIt
.
Get
()
>
0
)
)
{
if
(
!
inRightMaskPtr
||
(
inRightMask
Ptr
&&
inRightMask
It
.
Get
()
>
0
)
)
if
(
!
inRightMaskPtr
||
(
inRightMaskIt
.
Get
()
>
0
)
)
{
RegionType
smallRightRegion
;
smallRightRegion
.
SetIndex
(
0
,
curRightPos
[
0
]
-
1
);
...
...
@@ -1696,9 +1696,9 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
inRightMaskIt
.
SetIndex
(
curRightPos
);
}
// check that the current positions are not masked
if
(
!
inLeftMaskPtr
||
(
inLeftMask
Ptr
&&
inLeftMask
It
.
Get
()
>
0
)
)
if
(
!
inLeftMaskPtr
||
(
inLeftMaskIt
.
Get
()
>
0
)
)
{
if
(
!
inRightMaskPtr
||
(
inRightMask
Ptr
&&
inRightMask
It
.
Get
()
>
0
)
)
if
(
!
inRightMaskPtr
||
(
inRightMaskIt
.
Get
()
>
0
)
)
{
RegionType
smallRightRegion
;
smallRightRegion
.
SetIndex
(
0
,
curRightPos
[
0
]
-
1
);
...
...
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