Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Julien Cabieces
otb
Commits
24199ae5
Commit
24199ae5
authored
9 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix other potential issues with AdaptativeSplitter see #983
parent
861ed67a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
+14
-2
14 additions, 2 deletions
.../Core/Common/include/otbImageRegionAdaptativeSplitter.txx
with
14 additions
and
2 deletions
Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
+
14
−
2
View file @
24199ae5
...
...
@@ -181,7 +181,9 @@ ImageRegionAdaptativeSplitter<VImageDimension>
unsigned int i = 1;
while(totalTiles * (divideTiles[0] * divideTiles[1]) < m_RequestedNumberOfSplits)
// Exit condition if divideTiles=m_TileHint (i.e. no more subdivision available)
while(totalTiles * (divideTiles[0] * divideTiles[1]) < m_RequestedNumberOfSplits
&& (divideTiles[0] < m_TileHint[0] || divideTiles[1] < m_TileHint[1]))
{
if(divideTiles[i] < m_TileHint[i])
{
...
...
@@ -195,6 +197,8 @@ ImageRegionAdaptativeSplitter<VImageDimension>
splitSize[0] = (m_TileHint[0] + divideTiles[0] - 1)/ divideTiles[0];
splitSize[1] = (m_TileHint[1] + divideTiles[1] - 1)/ divideTiles[1];
RegionType tileHintRegion;
tileHintRegion.SetSize(m_TileHint);
// Fill the tiling scheme
for(unsigned int tiley = 0; tiley < tilesPerDim[1]; ++tiley)
{
...
...
@@ -214,13 +218,21 @@ ImageRegionAdaptativeSplitter<VImageDimension>
newSplit.SetIndex(newSplitIndex);
newSplit.SetSize(splitSize);
tileHintRegion.SetIndex(0, tilex * m_TileHint[0]);
tileHintRegion.SetIndex(1, tiley * m_TileHint[1]);
bool cropped = newSplit.Crop(m_ImageRegion);
// If newSplit could not be cropped, it means that it is
// outside m_ImageRegion. In this case we ignore it.
if(cropped)
{
m_StreamVector.push_back(newSplit);
// check that the split stays inside its tile
cropped = newSplit.Crop(tileHintRegion);
if (cropped)
{
m_StreamVector.push_back(newSplit);
}
}
}
}
...
...
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