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
0e723e70
Commit
0e723e70
authored
Nov 20, 2020
by
Julien Osman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: Encapsulate output metadata in GenericRSResampleImageFilter
parent
8f85f3d2
Pipeline
#6207
failed with stages
in 92 minutes and 39 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
Modules/Core/Metadata/src/otbImageMetadata.cxx
Modules/Core/Metadata/src/otbImageMetadata.cxx
+1
-1
Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
...ng/Projection/include/otbGenericRSResampleImageFilter.hxx
+5
-3
No files found.
Modules/Core/Metadata/src/otbImageMetadata.cxx
View file @
0e723e70
...
@@ -481,7 +481,7 @@ void ImageMetadata::Merge(const ImageMetadata& imd)
...
@@ -481,7 +481,7 @@ void ImageMetadata::Merge(const ImageMetadata& imd)
{
{
ImageMetadataBase
::
Fuse
(
imd
);
ImageMetadataBase
::
Fuse
(
imd
);
for
(
unsigned
int
i
=
0
;
i
<
std
::
min
(
Bands
.
size
(),
imd
.
Bands
.
size
());
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
std
::
min
(
Bands
.
size
(),
imd
.
Bands
.
size
());
++
i
)
{
{
Bands
[
i
].
Fuse
(
imd
.
Bands
[
i
]);
Bands
[
i
].
Fuse
(
imd
.
Bands
[
i
]);
}
}
...
...
Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
View file @
0e723e70
...
@@ -99,8 +99,10 @@ void GenericRSResampleImageFilter<TInputImage, TOutputImage>::GenerateOutputInfo
...
@@ -99,8 +99,10 @@ void GenericRSResampleImageFilter<TInputImage, TOutputImage>::GenerateOutputInfo
m_Resampler
->
UpdateOutputInformation
();
m_Resampler
->
UpdateOutputInformation
();
this
->
GraftOutput
(
m_Resampler
->
GetOutput
());
this
->
GraftOutput
(
m_Resampler
->
GetOutput
());
// Encapsulate output projRef
// Encapsulate output projRef and metadata
this
->
GetOutput
()
->
m_Imd
.
Add
(
MDGeom
::
ProjectionProj
,
this
->
GetOutputProjectionRef
());
if
(
this
->
GetOutputImageMetadata
()
!=
nullptr
)
this
->
GetOutput
()
->
m_Imd
.
Merge
(
*
(
this
->
GetOutputImageMetadata
()));
this
->
GetOutput
()
->
m_Imd
.
Add
(
MDGeom
::
ProjectionWKT
,
this
->
GetOutputProjectionRef
());
}
}
/**
/**
...
@@ -119,8 +121,8 @@ void GenericRSResampleImageFilter<TInputImage, TOutputImage>::EstimateOutputRpcM
...
@@ -119,8 +121,8 @@ void GenericRSResampleImageFilter<TInputImage, TOutputImage>::EstimateOutputRpcM
tempPtr
->
SetRegions
(
region
);
tempPtr
->
SetRegions
(
region
);
// Encapsulate the output metadata in the temp image
// Encapsulate the output metadata in the temp image
tempPtr
->
m_Imd
.
Add
(
MDGeom
::
ProjectionWKT
,
this
->
GetOutputProjectionRef
());
tempPtr
->
SetImageMetadata
(
*
(
this
->
GetOutputImageMetadata
()));
tempPtr
->
SetImageMetadata
(
*
(
this
->
GetOutputImageMetadata
()));
tempPtr
->
m_Imd
.
Add
(
MDGeom
::
ProjectionProj
,
this
->
GetOutputProjectionRef
());
// Estimate the rpc model from the temp image
// Estimate the rpc model from the temp image
m_OutputRpcEstimator
->
SetInput
(
tempPtr
);
m_OutputRpcEstimator
->
SetInput
(
tempPtr
);
...
...
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