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
5559c46e
Commit
5559c46e
authored
13 years ago
by
Julien Malik
Browse files
Options
Downloads
Patches
Plain Diff
COMP: fix ambiguous call to vcl_floor on windows
parent
6d00c228
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/BasicFilters/otbMeanShiftImageFilter2.h
+1
-1
1 addition, 1 deletion
Code/BasicFilters/otbMeanShiftImageFilter2.h
Code/BasicFilters/otbMeanShiftImageFilter2.txx
+16
-19
16 additions, 19 deletions
Code/BasicFilters/otbMeanShiftImageFilter2.txx
with
17 additions
and
20 deletions
Code/BasicFilters/otbMeanShiftImageFilter2.h
+
1
−
1
View file @
5559c46e
...
@@ -86,7 +86,7 @@ public:
...
@@ -86,7 +86,7 @@ public:
typedef
typename
InputImageType
::
PixelType
InputPixelType
;
typedef
typename
InputImageType
::
PixelType
InputPixelType
;
typedef
typename
InputImageType
::
IndexType
InputIndexType
;
typedef
typename
InputImageType
::
IndexType
InputIndexType
;
typedef
typename
InputImageType
::
SizeType
InputSizeType
;
typedef
typename
InputImageType
::
SizeType
InputSizeType
;
typedef
typename
InputImageType
::
Index
Type
Index
Type
;
typedef
typename
InputImageType
::
Index
ValueType
InputIndexValue
Type
;
typedef
typename
InputImageType
::
PointType
PointType
;
typedef
typename
InputImageType
::
PointType
PointType
;
typedef
typename
InputImageType
::
RegionType
RegionType
;
typedef
typename
InputImageType
::
RegionType
RegionType
;
typedef
typename
InputImageType
::
SizeType
SizeType
;
typedef
typename
InputImageType
::
SizeType
SizeType
;
...
...
This diff is collapsed.
Click to expand it.
Code/BasicFilters/otbMeanShiftImageFilter2.txx
+
16
−
19
View file @
5559c46e
...
@@ -513,26 +513,23 @@ void MeanShiftImageFilter2<TInputImage,TOutputMetricImage, TOutputImage, TKernel
...
@@ -513,26 +513,23 @@ void MeanShiftImageFilter2<TInputImage,TOutputMetricImage, TOutputImage, TKernel
InputSizeType inputSize = requestedRegion.GetSize();
InputSizeType inputSize = requestedRegion.GetSize();
InputIndexType inputIndex = requestedRegion.GetIndex();
InputIndexType inputIndex = requestedRegion.GetIndex();
unsigned int width = inputSize[0];
unsigned int height = inputSize[1];
// define region
// define region
itk::ImageRegion<2> imageRegion;
itk::ImageRegion<2> imageRegion;
IndexType index;
Input
IndexType index;
index[0] = vcl_floor(latticePosition[0] + 0.5);
index[0] =
static_cast<InputIndexValueType>(
vcl_floor(latticePosition[0] + 0.5)
)
;
index[1] = vcl_floor(latticePosition[1] + 0.5);
index[1] =
static_cast<InputIndexValueType>(
vcl_floor(latticePosition[1] + 0.5)
)
;
int xMin = index[0] -
vcl_floor(kernelSize[0] / 2);
InputIndexValueType xMin = index[0] - static_cast<InputIndexValueType>(
vcl_floor(kernelSize[0] / 2)
)
;
int
xMax = xMin + kernelSize[0];
InputIndexValueType
xMax = xMin + kernelSize[0];
int yMin = index[1] -
vcl_floor(kernelSize[1] / 2);
InputIndexValueType yMin = index[1] - static_cast<InputIndexValueType>(
vcl_floor(kernelSize[1] / 2)
)
;
int
yMax = yMin + kernelSize[1];
InputIndexValueType
yMax = yMin + kernelSize[1];
IndexType minIndex;
Input
IndexType minIndex;
minIndex[0] = vcl_max(xMin,
static_cast<int>(
inputIndex[0])
)
; // add image index
minIndex[0] = vcl_max(xMin,inputIndex[0]); // add image index
minIndex[1] = vcl_max(yMin,
static_cast<int>(
inputIndex[1])
)
; // add image index
minIndex[1] = vcl_max(yMin,inputIndex[1]); // add image index
IndexType maxIndex;
Input
IndexType maxIndex;
maxIndex[0] = vcl_min(xMax, static_cast<
int> (width
-1+inputIndex[0])); //add image index
maxIndex[0] = vcl_min(xMax, static_cast<
InputIndexValueType>(inputSize[0]
-1+inputIndex[0])); //add image index
maxIndex[1] = vcl_min(yMax, static_cast<
int> (height
-1+inputIndex[1])); //add image index
maxIndex[1] = vcl_min(yMax, static_cast<
InputIndexValueType>(inputSize[1]
-1+inputIndex[1])); //add image index
imageRegion.SetIndex(index);
imageRegion.SetIndex(index);
SizeType size;
SizeType size;
...
@@ -542,7 +539,7 @@ void MeanShiftImageFilter2<TInputImage,TOutputMetricImage, TOutputImage, TKernel
...
@@ -542,7 +539,7 @@ void MeanShiftImageFilter2<TInputImage,TOutputMetricImage, TOutputImage, TKernel
OutputPixelType *it = *neighborhood;
OutputPixelType *it = *neighborhood;
PointType pixelPos;
PointType pixelPos;
IndexType pixelIndex;
Input
IndexType pixelIndex;
InputPixelType inputPixel;
InputPixelType inputPixel;
inputPixel.SetSize(numberOfComponents);
inputPixel.SetSize(numberOfComponents);
...
...
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