Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Scott Wittenburg
VTK
Commits
ca2cf9db
Commit
ca2cf9db
authored
Mar 29, 2005
by
Berk Geveci
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: Do not rely on ShallowCopy to copy pipeline information
parent
635957a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
Filtering/vtkCompositeDataPipeline.cxx
Filtering/vtkCompositeDataPipeline.cxx
+2
-1
IO/vtkGenericEnSightReader.cxx
IO/vtkGenericEnSightReader.cxx
+2
-1
IO/vtkXMLImageDataReader.cxx
IO/vtkXMLImageDataReader.cxx
+8
-4
No files found.
Filtering/vtkCompositeDataPipeline.cxx
View file @
ca2cf9db
...
...
@@ -35,7 +35,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkStructuredGrid.h"
#include "vtkUniformGrid.h"
vtkCxxRevisionMacro
(
vtkCompositeDataPipeline
,
"1.
8
"
);
vtkCxxRevisionMacro
(
vtkCompositeDataPipeline
,
"1.
9
"
);
vtkStandardNewMacro
(
vtkCompositeDataPipeline
);
vtkInformationKeyMacro
(
vtkCompositeDataPipeline
,
BEGIN_LOOP
,
Integer
);
...
...
@@ -376,6 +376,7 @@ int vtkCompositeDataPipeline::ExecuteInformationForBlock(vtkInformation* request
if
(
dobj
&&
dobjCopy
)
{
dobjCopy
->
ShallowCopy
(
dobj
);
dobjCopy
->
CopyInformation
(
dobj
);
}
}
}
...
...
IO/vtkGenericEnSightReader.cxx
View file @
ca2cf9db
...
...
@@ -30,7 +30,7 @@
#include <assert.h>
#include <ctype.h>
/* isspace */
vtkCxxRevisionMacro
(
vtkGenericEnSightReader
,
"1.
69
"
);
vtkCxxRevisionMacro
(
vtkGenericEnSightReader
,
"1.
70
"
);
vtkStandardNewMacro
(
vtkGenericEnSightReader
);
vtkCxxSetObjectMacro
(
vtkGenericEnSightReader
,
TimeSets
,
...
...
@@ -225,6 +225,7 @@ void vtkGenericEnSightReader::Execute()
output
=
tmp
->
NewInstance
();
this
->
SetNthOutput
(
i
,
output
);
// law: this causes the extra partid bug
output
->
ShallowCopy
(
tmp
);
output
->
CopyInformation
(
tmp
);
output
->
Delete
();
// Used later.
//output = NULL;
...
...
IO/vtkXMLImageDataReader.cxx
View file @
ca2cf9db
...
...
@@ -22,7 +22,7 @@
#include "vtkInformation.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro
(
vtkXMLImageDataReader
,
"1.
7
"
);
vtkCxxRevisionMacro
(
vtkXMLImageDataReader
,
"1.
8
"
);
vtkStandardNewMacro
(
vtkXMLImageDataReader
);
//----------------------------------------------------------------------------
...
...
@@ -116,10 +116,10 @@ void vtkXMLImageDataReader::SetupOutputInformation(vtkInformation *outInfo)
//----------------------------------------------------------------------------
void
vtkXMLImageDataReader
::
CopyOutputInformation
(
vtkInformation
*
outInfo
,
int
port
)
{
{
this
->
Superclass
::
CopyOutputInformation
(
outInfo
,
port
);
vtkInformation
*
localInfo
=
this
->
GetExecutive
()
->
GetOutputInformation
(
port
);
if
(
localInfo
->
Has
(
vtkDataObject
::
ORIGIN
())
)
{
outInfo
->
CopyEntry
(
localInfo
,
vtkDataObject
::
ORIGIN
()
);
...
...
@@ -128,7 +128,11 @@ void vtkXMLImageDataReader::CopyOutputInformation(vtkInformation *outInfo, int p
{
outInfo
->
CopyEntry
(
localInfo
,
vtkDataObject
::
SPACING
()
);
}
}
if
(
localInfo
->
Has
(
vtkStreamingDemandDrivenPipeline
::
WHOLE_EXTENT
())
)
{
outInfo
->
CopyEntry
(
localInfo
,
vtkStreamingDemandDrivenPipeline
::
WHOLE_EXTENT
()
);
}
}
//----------------------------------------------------------------------------
...
...
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