Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
0c8eab2c
Commit
0c8eab2c
authored
Nov 03, 2015
by
Julien Michel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: Properly handle Integer64 fields in OGRFieldWrapper and OGRLayerStreamStitchingFilter
parent
940ed00f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
+13
-0
Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
...GRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
+4
-0
No files found.
Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
View file @
0c8eab2c
...
...
@@ -23,6 +23,7 @@
/*===============================[ Includes ]================================*/
/*===========================================================================*/
#include "otbOGRFieldWrapper.h"
#include "otbConfigure.h"
#include <cassert>
#include <vector>
#include <boost/mpl/map.hpp>
...
...
@@ -84,6 +85,10 @@ typedef boost::mpl::map
, pair<char* , int_<OFTString> >
, pair<char const* , int_<OFTString> >
, pair<std::vector<std::string>, int_<OFTStringList> >
#ifdef OTB_USE_GDAL_20
, pair<GIntBig, int_<OFTInteger64> >
, pair<std::vector<GIntBig>, int_<OFTInteger64List> >
#endif
// OFTBinary
// OFTDate
// OFTTime
...
...
@@ -312,6 +317,10 @@ typedef map
, pair<int_<OFTRealList>, MemberContainerGetterPtr<double, &OGRFeature::GetFieldAsDoubleList> >
, pair<int_<OFTString>, MemberGetterPtr<char const*, &OGRFeature::GetFieldAsString, std::string> >
, pair<int_<OFTStringList>, StringListMemberGetterPtr<std::vector<std::string> > >
#ifdef OTB_USE_GDAL_20
, pair<int_<OFTInteger64>, MemberGetterPtr<GIntBig, &OGRFeature::GetFieldAsInteger64> >
, pair<int_<OFTInteger64List>, MemberContainerGetterPtr<GIntBig, &OGRFeature::GetFieldAsInteger64List> >
#endif
> FieldGetters_Map;
/**\ingroup GeometryInternals
...
...
@@ -327,6 +336,10 @@ typedef map
, pair<int_<OFTRealList>, MemberContainerSetterPtr<double, &OGRFeature::SetField> >
, pair<int_<OFTString>, MemberSetterPtr<char const*, &OGRFeature::SetField/*, std::string*/> >
, pair<int_<OFTStringList>, StringListMemberSetterPtr<std::vector<std::string> > >
#ifdef OTB_USE_GDAL_20
, pair<int_<OFTInteger64>, MemberSetterPtr<GIntBig, &OGRFeature::SetField> >
, pair<int_<OFTInteger64List>, MemberContainerSetterPtr<const GIntBig, &OGRFeature::SetField> >
#endif
> FieldSetters_Map;
/**\ingroup GeometryInternals
...
...
Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
View file @
0c8eab2c
...
...
@@ -317,7 +317,11 @@ OGRLayerStreamStitchingFilter<TInputImage>
ogr::Field field = upper.feat[0];
try
{
#ifdef OTB_USE_GDAL_20
fusionFeature[0].SetValue(field.GetValue<GIntBig>());
#else
fusionFeature[0].SetValue(field.GetValue<int>());
#endif
m_OGRLayer.CreateFeature(fusionFeature);
m_OGRLayer.DeleteFeature(lower.feat.GetFID());
m_OGRLayer.DeleteFeature(upper.feat.GetFID());
...
...
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