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
0d1911c0
Commit
0d1911c0
authored
Feb 13, 2018
by
Julien Michel
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: Track down upstream pipeline for each image in ImageList (fix
#1516
)
parent
a2119c37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
...Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+1
-1
Modules/Core/Streaming/src/otbPipelineMemoryPrintCalculator.cxx
...s/Core/Streaming/src/otbPipelineMemoryPrintCalculator.cxx
+12
-5
No files found.
Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
View file @
0d1911c0
...
...
@@ -121,7 +121,7 @@ public:
static
const
double
MegabyteToByte
;
/** Evaluate the print (in bytes) of a single data object */
MemoryPrintType
EvaluateDataObjectPrint
(
DataObjectType
*
data
)
const
;
MemoryPrintType
EvaluateDataObjectPrint
(
DataObjectType
*
data
);
protected:
/** Constructor */
...
...
Modules/Core/Streaming/src/otbPipelineMemoryPrintCalculator.cxx
View file @
0d1911c0
...
...
@@ -183,11 +183,16 @@ PipelineMemoryPrintCalculator
{ \
ImageList<Image<type, 2> > * imageList = dynamic_cast<otb::ImageList<otb::Image<type, 2> > *>(data); \
MemoryPrintType print(0); \
for(ImageList<Image<type, 2> >::
Const
Iterator it = imageList->Begin(); \
for(ImageList<Image<type, 2> >::Iterator it = imageList->Begin(); \
it != imageList->End(); ++it) \
{ \
print += it.Get()->GetRequestedRegion().GetNumberOfPixels() \
* it.Get()->GetNumberOfComponentsPerPixel() * sizeof(type); \
if(it.Get()->GetSource()) \
{ \
it.Get()->PropagateRequestedRegion(); \
print += this->EvaluateProcessObjectPrintRecursive(it.Get()->GetSource());\
} \
else \
print += this->EvaluateDataObjectPrint(it.Get()); \
} \
return print; \
} \
...
...
@@ -198,8 +203,10 @@ PipelineMemoryPrintCalculator
for(ImageList<VectorImage<type, 2> >::ConstIterator it = imageList->Begin(); \
it != imageList->End(); ++it) \
{ \
print += it.Get()->GetRequestedRegion().GetNumberOfPixels() \
* it.Get()->GetNumberOfComponentsPerPixel() * sizeof(type); \
if(it.Get()->GetSource()) \
print += this->EvaluateProcessObjectPrintRecursive(it.Get()->GetSource());\
else \
print += this->EvaluateDataObjectPrint(it.Get()); \
} \
return print; \
} \
...
...
Julien Michel
@jmichel
mentioned in commit
3d8ddf16
·
Feb 19, 2018
mentioned in commit
3d8ddf16
mentioned in commit 3d8ddf164889cda62a0a2d427390ce3b2d24fa42
Toggle commit list
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