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
Container Registry
Model registry
Operate
Environments
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
Sébastien Peillet
otb
Commits
58d90445
Commit
58d90445
authored
7 years ago
by
Julien Michel
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-6.0' into develop
parents
e7fbfb5a
7d8e959c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Modules/Applications/AppClassification/app/otbVectorClassifier.cxx
+6
-2
6 additions, 2 deletions
...pplications/AppClassification/app/otbVectorClassifier.cxx
Modules/ThirdParty/SiftFast/src/CMakeLists.txt
+0
-2
0 additions, 2 deletions
Modules/ThirdParty/SiftFast/src/CMakeLists.txt
with
6 additions
and
4 deletions
Modules/Applications/AppClassification/app/otbVectorClassifier.cxx
+
6
−
2
View file @
58d90445
...
...
@@ -210,7 +210,7 @@ private:
const
int
nbFeatures
=
GetSelectedItems
(
"feat"
).
size
();
input
->
SetMeasurementVectorSize
(
nbFeatures
);
otb
::
ogr
::
Layer
::
const_iterator
it
=
layer
.
cbegin
();
otb
::
ogr
::
Layer
::
const_iterator
itEnd
=
layer
.
cend
();
for
(
;
it
!=
itEnd
;
++
it
)
...
...
@@ -219,7 +219,11 @@ private:
mv
.
SetSize
(
nbFeatures
);
for
(
int
idx
=
0
;
idx
<
nbFeatures
;
++
idx
)
{
mv
[
idx
]
=
(
*
it
)[
GetSelectedItems
(
"feat"
)[
idx
]].
GetValue
<
double
>
();
// Beware that itemIndex differs from ogr layer field index
unsigned
int
itemIndex
=
GetSelectedItems
(
"feat"
)[
idx
];
std
::
string
fieldName
=
GetChoiceNames
(
"feat"
)[
itemIndex
];
mv
[
idx
]
=
(
*
it
)[
fieldName
].
GetValue
<
double
>
();
}
input
->
PushBack
(
mv
);
}
...
...
This diff is collapsed.
Click to expand it.
Modules/ThirdParty/SiftFast/src/CMakeLists.txt
+
0
−
2
View file @
58d90445
...
...
@@ -51,8 +51,6 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
message
(
FATAL_ERROR
"Impossible to compile libsiftfast. Contact OTB development team"
)
endif
()
set
(
OTB_DISABLE_FAST_FUNCTIONS_VALUE 1
)
else
()
message
(
STATUS
"Try to compile libsiftfast.cpp done."
)
endif
()
set
(
CMAKE_CXX_FLAGS_RELEASE
"-O3 -g"
)
...
...
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