Commit f23ee19a authored by Aashish Chaudhary's avatar Aashish Chaudhary

Merge remote-tracking branch 'origin/master' into volume_fix_cell_data_release_updated_master

Conflicts:
	Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
parents 2140f97b fb5db02b
Pipeline #8213 passed with stage

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -119,7 +119,7 @@ public:
DAX_ASSERT_CONT(this->NumberOfValues == 0);
}
}
catch (std::bad_alloc err)
catch (const std::bad_alloc&)
{
// Make sureour state is OK.
this->Array = NULL;
......@@ -223,7 +223,7 @@ public:
DAX_ASSERT_CONT(this->NumberOfValues == 0);
}
}
catch (std::bad_alloc err)
catch (const std::bad_alloc&)
{
// Make sureour state is OK.
this->Array = NULL;
......@@ -326,7 +326,7 @@ public:
DAX_ASSERT_CONT(this->NumberOfValues == 0);
}
}
catch (std::bad_alloc err)
catch (const std::bad_alloc&)
{
// Make sureour state is OK.
this->Array = NULL;
......
......@@ -205,13 +205,13 @@ struct DoContour<1>
}
} //computeScalars
}
catch(dax::cont::ErrorControlOutOfMemory error)
catch(const dax::cont::ErrorControlOutOfMemory& error)
{
std::cerr << "Ran out of memory trying to use the GPU" << std::endl;
std::cerr << error.GetMessage() << std::endl;
result = 0;
}
catch(dax::cont::ErrorExecution error)
catch(const dax::cont::ErrorExecution& error)
{
std::cerr << "Got ErrorExecution from Dax." << std::endl;
std::cerr << error.GetMessage() << std::endl;
......
......@@ -139,13 +139,13 @@ namespace vtkToDax
attributeType);
}
}
catch(dax::cont::ErrorControlOutOfMemory error)
catch(const dax::cont::ErrorControlOutOfMemory& error)
{
std::cerr << "Ran out of memory trying to use the GPU" << std::endl;
std::cerr << error.GetMessage() << std::endl;
result = 0;
}
catch(dax::cont::ErrorExecution error)
catch(const dax::cont::ErrorExecution& error)
{
std::cerr << "Got ErrorExecution from Dax." << std::endl;
std::cerr << error.GetMessage() << std::endl;
......
......@@ -73,12 +73,14 @@ void SetIsoValueRMI(void *localArg, void *vtkNotUsed(remoteArg),
float val;
vtkMultiProcessController *contrl = args->Controller;
vtkPistonContour *iso = args->ContourFilter;
val = iso->GetIsoValue();
iso->SetIsoValue(val + ISO_STEP);
args->elev->Update();
args->elev->Update(contrl->GetLocalProcessId(),
contrl->GetNumberOfProcesses(), 0);
vtkMultiProcessController *contrl = args->Controller;
contrl->Send(args->elev->GetOutput(), 0, ISO_OUTPUT_TAG);
}
......@@ -113,14 +115,8 @@ void MyMain(vtkMultiProcessController *controller, void *arg)
val = (myid+1) / static_cast<float>(numProcs);
elev->SetScalarRange(val, val+0.001);
// Tell the pipeline which piece we want to update.
vtkStreamingDemandDrivenPipeline *exec =
vtkStreamingDemandDrivenPipeline::SafeDownCast(elev->GetExecutive());
exec->SetUpdateNumberOfPieces(exec->GetOutputInformation(0), numProcs);
exec->SetUpdatePiece(exec->GetOutputInformation(0), myid);
// Make sure all processes update at the same time.
elev->Update();
elev->Update(myid, numProcs, 0);
if (myid != 0)
{
......@@ -168,7 +164,7 @@ void MyMain(vtkMultiProcessController *controller, void *arg)
{
// Set the local value
contour->SetIsoValue(contour->GetIsoValue() + ISO_STEP);
elev->Update();
elev->Update(myid, numProcs, 0);
for (int i = 1; i < numProcs; ++i)
{
......
......@@ -588,18 +588,18 @@ void vtkPistonMapper::Update()
{
this->UpdateInformation();
vtkInformation* inInfo = this->GetInputInformation();
// vtkInformation* inInfo = this->GetInputInformation();
// If the estimated pipeline memory usage is larger than
// the memory limit, break the current piece into sub-pieces.
if (inInfo)
{
vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
inInfo,
this->Piece,
this->NumberOfPieces,
this->GhostLevel);
}
// if (inInfo)
// {
// vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
// inInfo,
// this->Piece,
// this->NumberOfPieces,
// this->GhostLevel);
// }
this->vtkMapper::Update();
}
......@@ -41,6 +41,32 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
Sockets-image
)
#####################################################
# Be aware CMake currently warns on all the following
#
# "([^ :]+):([0-9]+): warning:",
# "([^ :]+):([0-9]+): note:",
# "^cc[^C]*CC: WARNING File = ([^,]+), Line = ([0-9]+)",
# "^ld([^:])*:([ \\t])*WARNING([^:])*:",
# "([^:]+): warning ([0-9]+):",
# "^\"[^\"]+\", line [0-9]+: [Ww](arning|arnung)",
# "([^:]+): warning[ \\t]*[0-9]+[ \\t]*:",
# "^(Warning|Warnung) ([0-9]+):",
# "^(Warning|Warnung)[ :]",
# "WARNING: ",
# "([^ :]+) : warning",
# "([^:]+): warning",
# "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([WI]\\)",
# "^cxx: Warning:",
# ".*file: .* has no symbols",
# "([^ :]+):([0-9]+): (Warning|Warnung)",
# "\\([0-9]*\\): remark #[0-9]*",
# "\".*\", line [0-9]+: remark\\([0-9]*\\):",
# "cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*",
# "^CMake Warning.*:",
# "^\\[WARNING\\]",
SET(CTEST_CUSTOM_WARNING_MATCH
${CTEST_CUSTOM_WARNING_MATCH}
"{standard input}:[0-9][0-9]*: Warning: "
......@@ -65,7 +91,9 @@ ENDIF()
SET(CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
"vcruntime_exception.h\\(43\\): note: see declaration"
"Utilities/vtktiff/"
"json/json"
"list.[0-9]+. : warning C4702: unreachable code"
"xtree.[0-9]+. : warning C4702: unreachable code"
"vector.[0-9]+. : warning C4702: unreachable code"
......@@ -290,8 +318,16 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
"warning C4275: non dll-interface class 'std::exception' used as base"
# This warning occurs when building Java with -source x.y with compiler a.b's
# runtime library (rt.jar).
# runtime library (rt.jar). It also emits a line with "1 warning"
# which matches ctests regex as well
"bootstrap class path not set in conjunction with -source"
"1 warning"
#supress diy2 warnings
"include.*diy"
"diy::"
"expanded from macro 'diy'"
)
IF(APPLE)
......
#
# Find the native FFMPEG includes and library
#
# This module defines
# FFMPEG_INCLUDE_DIR, where to find avcodec.h, avformat.h ...
# FFMPEG_LIBRARIES, the libraries to link against to use FFMPEG.
# FFMPEG_FOUND, If false, do not try to use FFMPEG.
# also defined, but not for general use are
# FFMPEG_avformat_LIBRARY and FFMPEG_avcodec_LIBRARY, where to find the FFMPEG library.
# This is useful to do it this way so that we can always add more libraries
# if needed to FFMPEG_LIBRARIES if ffmpeg ever changes...
# If the FFMPEG headers are all in one directory.
find_path(FFMPEG_INCLUDE_DIR avformat.h
PATHS
$ENV{FFMPEG_DIR}/include
$ENV{OSGDIR}/include
$ENV{OSG_ROOT}/include
~/Library/Frameworks
/Library/Frameworks
/usr/local/include
/usr/include
/sw/include # Fink
/opt/local/include # DarwinPorts
/opt/csw/include # Blastwave
/opt/include
/usr/freeware/include
PATH_SUFFIXES ffmpeg
DOC "Location of FFMPEG Headers"
)
# If the FFMPEG headers are separated to each of libavformat, libavcodec etc..
if(NOT FFMPEG_INCLUDE_DIR)
find_path(FFMPEG_INCLUDE_DIR libavformat/avformat.h
PATHS
$ENV{FFMPEG_DIR}/include
$ENV{OSGDIR}/include
$ENV{OSG_ROOT}/include
~/Library/Frameworks
/Library/Frameworks
/usr/local/include
/usr/include
/sw/include # Fin