Commit 00e998ce authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic '14646-scalar-bar-borders' into pv-master

1aa0a945 Merge topic '14646-scalar-bar-borders' into master
02666b57 Merge topic 'unreachable-return' into master
d80ccfb6 Fix unreachable code warning in otherCellTypes.cxx.
2e262725 Merge topic 'catalyst-web-composite' into master
6d42e913 Improve basic search in web-catalyst
f43db5e0 Merge topic 'R_row_names' into master
20d5df76 BUG: Border visibility from underlying vtkScalarBar actor
48341cd5 copy row names from R to vtkTable
0b03bebf Merge topic 'catalyst-web-composite' into master
3ce7a4f1 Improve ParaView cinema UI
01a29205 Merge topic 'NSOpenGLPFACompliant' into master
dfaddbaa Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
621c98ad Merge topic 'view-settings' into master
468f25df Removed all uses of deprecated NSOpenGLPFACompliant
410e53cd Name enum LEFT, BOTTOM, ... Location.
90ef4451 Merge topic 'vtkOStreamWrapper-std-string' into master
...
parents 639b066d 1aa0a945
......@@ -38,17 +38,26 @@ if (NETCDF_INCLUDE_DIR AND NETCDF_LIBRARY)
set (NETCDF_FIND_QUIETLY TRUE)
endif ()
set(USE_DEFAULT_PATHS "NO_DEFAULT_PATH")
if(NETCDF_USE_DEFAULT_PATHS)
set(USE_DEFAULT_PATHS "")
endif()
find_path (NETCDF_INCLUDE_DIR netcdf.h
HINTS NETCDF_DIR ENV NETCDF_DIR)
HINTS "${NETCDF_DIR}/include")
mark_as_advanced (NETCDF_INCLUDE_DIR)
set (NETCDF_C_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR})
find_library (NETCDF_LIBRARY NAMES netcdf)
find_library (NETCDF_LIBRARY NAMES netcdf
HINTS "${NETCDF_DIR}/lib")
mark_as_advanced (NETCDF_LIBRARY)
set (NETCDF_C_LIBRARIES ${NETCDF_LIBRARY})
#start finding requested language components
set (NetCDF_libs "")
set (NetCDF_includes "${NETCDF_INCLUDE_DIR}")
get_filename_component (NetCDF_lib_dirs "${NETCDF_LIBRARY}" PATH)
set (NETCDF_HAS_INTERFACES "YES") # will be set to NO if we're missing any interfaces
......@@ -56,9 +65,15 @@ macro (NetCDF_check_interface lang header libs)
if (NETCDF_${lang})
#search starting from user modifiable cache var
find_path (NETCDF_${lang}_INCLUDE_DIR NAMES ${header}
HINTS "${NETCDF_INCLUDE_DIR}" NO_DEFAULT_PATH)
HINTS "${NETCDF_INCLUDE_DIR}"
HINTS "${NETCDF_${lang}_ROOT}/include"
${USE_DEFAULT_PATHS})
find_library (NETCDF_${lang}_LIBRARY NAMES ${libs}
HINTS "${NetCDF_lib_dirs}" NO_DEFAULT_PATH)
HINTS "${NetCDF_lib_dirs}"
HINTS "${NETCDF_${lang}_ROOT}/lib"
${USE_DEFAULT_PATHS})
mark_as_advanced (NETCDF_${lang}_INCLUDE_DIR NETCDF_${lang}_LIBRARY)
#export to internal varS that rest of project can use directly
......@@ -67,6 +82,7 @@ macro (NetCDF_check_interface lang header libs)
if (NETCDF_${lang}_INCLUDE_DIR AND NETCDF_${lang}_LIBRARY)
list (APPEND NetCDF_libs ${NETCDF_${lang}_LIBRARY})
list (APPEND NetCDF_includes ${NETCDF_${lang}_INCLUDE_DIR})
else ()
set (NETCDF_HAS_INTERFACES "NO")
message (STATUS "Failed to find NetCDF interface for ${lang}")
......@@ -93,7 +109,7 @@ NetCDF_check_interface (F90 netcdf.mod netcdff)
#export accumulated results to internal varS that rest of project can depend on
list (APPEND NetCDF_libs "${NETCDF_C_LIBRARIES}")
set (NETCDF_LIBRARIES ${NetCDF_libs})
set (NETCDF_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR})
set (NETCDF_INCLUDE_DIRS ${NetCDF_includes})
# handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE if
# all listed variables are TRUE
......
......@@ -71,7 +71,7 @@ public:
// Description:
// Enumeration of the axis locations in a conventional XY chart. Other
// layouts are possible.
enum {
enum Location {
LEFT = 0,
BOTTOM,
RIGHT,
......
......@@ -77,15 +77,10 @@ int otherCellTypes(int, char *[])
TestOCT();
// Might need to be ajusted if vtkCellTypes changes
if( VTK_NUMBER_OF_CELL_TYPES <= VTK_HIGHER_ORDER_HEXAHEDRON)
{
return 1;
}
bool fail1 = (VTK_NUMBER_OF_CELL_TYPES <= VTK_HIGHER_ORDER_HEXAHEDRON);
// vtkUnstructuredGrid uses uchar to store cellId
if( VTK_NUMBER_OF_CELL_TYPES > 255 )
{
return 1;
}
bool fail2 = (VTK_NUMBER_OF_CELL_TYPES > 255);
return 0;
return (fail1 || fail2);
}
......@@ -289,8 +289,8 @@ void vtkAlgorithm::SetInputArrayToProcess(int idx, int port, int connection,
int fieldAssociation,
const char *name)
{
// ignore empty string
if (!name || name[0] == '\0')
// ignore NULL string
if (!name)
{
return;
}
......@@ -573,7 +573,7 @@ vtkAbstractArray *vtkAlgorithm::GetInputAbstractArrayToProcess(
association = vtkDataObject::FIELD_ASSOCIATION_CELLS;
return inputDS->GetCellData()->GetAbstractArray(name);
}
else
else if (inArrayInfo->Has(vtkDataObject::FIELD_ATTRIBUTE_TYPE()))
{
vtkDataSet *inputDS = vtkDataSet::SafeDownCast(input);
if (!inputDS)
......@@ -596,6 +596,10 @@ vtkAbstractArray *vtkAlgorithm::GetInputAbstractArrayToProcess(
association = vtkDataObject::FIELD_ASSOCIATION_CELLS;
return inputDS->GetCellData()->GetAbstractAttribute(fType);
}
else
{
return NULL;
}
}
......
......@@ -357,12 +357,23 @@ vtkTable* vtkRAdapter::RToVTKTable(SEXP variable)
nc = Rf_ncols(variable);
nr = Rf_nrows(variable);
result = vtkTable::New();
names = getAttrib(variable, R_DimNamesSymbol);
if(!isNull(names))
{
vtkStringArray* rowNames = vtkStringArray::New();
for (i = 0; i < nr; ++i)
{
std::string rowName = CHAR(STRING_ELT(VECTOR_ELT(names,0),i));
rowNames->InsertNextValue(rowName);
}
result->AddColumn(rowNames);
rowNames->Delete();
}
for(j=0;j<nc;j++)
{
vtkDoubleArray* da = vtkDoubleArray::New();
da->SetNumberOfComponents(1);
names = getAttrib(variable, R_DimNamesSymbol);
if(!isNull(names))
{
da->SetName(CHAR(STRING_ELT(VECTOR_ELT(names,1),j)));
......
......@@ -997,7 +997,7 @@ int vtkExodusIIReaderPrivate::AssembleOutputGlobalArrays(
ofieldData->AddArray(arr);
}
if ( this->ModelParameters.title )
// Add the title
{
vtkStringArray* sarr = vtkStringArray::New();
sarr->SetName( "Title" );
......
......@@ -941,7 +941,7 @@ void vtkImageInterpolatorPrecomputeWeights(
}
}
int inId[4];
int inId[4] = { 0, 0, 0, 0 };
int l = 0;
switch (weights->BorderMode)
{
......
......@@ -64,6 +64,17 @@ void vtkScalarBarRepresentation::SetScalarBarActor(vtkScalarBarActor* actor)
if (actor && oldActor)
{
actor->SetOrientation(oldActor->GetOrientation());
if(actor->GetOrientation())
{
this->ShowHorizontalBorder = 2;
this->ShowVerticalBorder = 0;
}
else
{
this->ShowHorizontalBorder = 0;
this->ShowVerticalBorder = 2;
}
this->UpdateShowBorder();
}
}
}
......
......@@ -949,6 +949,13 @@ double vtkCellPicker::IntersectImageWithLine(const double p1[3],
// (this reduces the impact of roundoff error from the above computation)
bounds[2*k] = 0.5*vtkMath::Round(2.0*(bounds[2*k]));
bounds[2*k+1] = 0.5*vtkMath::Round(2.0*(bounds[2*k+1]));
// Reverse if spacing is negative
if (spacing[k] < 0)
{
double bt = bounds[2*k];
bounds[2*k] = bounds[2*k+1];
bounds[2*k+1] = bt;
}
}
// Clip the ray with the extent
......
......@@ -14,6 +14,7 @@ vtk_add_test_cxx(
TestAnimationScene.cxx
TestBackfaceCulling.cxx
TestBlurAndSobelPasses.cxx
TestCellPickerImage.cxx
TestDynamic2DLabelMapper.cxx
TestFBO.cxx,NO_VALID
TestFollowerPicking.cxx
......
/*=========================================================================
Program: Visualization Toolkit
Module: TestCellPickerImage.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// This tests picking of images with vtkCellPicker
//
// The command line arguments are:
// -I => run in interactive mode
#include "vtkTestUtilities.h"
#include "vtkRegressionTestImage.h"
#include "vtkCamera.h"
#include "vtkCellPicker.h"
#include "vtkConeSource.h"
#include "vtkDataSetMapper.h"
#include "vtkImageData.h"
#include "vtkImageProperty.h"
#include "vtkImageReader2.h"
#include "vtkImageResliceMapper.h"
#include "vtkImageSlice.h"
#include "vtkImageSliceMapper.h"
#include "vtkInteractorStyleImage.h"
#include "vtkProperty.h"
#include "vtkRenderWindow.h"
#include "vtkRenderWindowInteractor.h"
#include "vtkRenderer.h"
// A function to point an actor along a vector
void PointCone(vtkActor *actor, double nx, double ny, double nz)
{
if (nx < 0.0)
{
actor->RotateWXYZ(180, 0, 1, 0);
actor->RotateWXYZ(180, (nx - 1.0)*0.5, ny*0.5, nz*0.5);
}
else
{
actor->RotateWXYZ(180, (nx + 1.0)*0.5, ny*0.5, nz*0.5);
}
}
int TestCellPickerImage(int argc, char* argv[])
{
vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
vtkInteractorStyle *style = vtkInteractorStyleImage::New();
vtkRenderWindow *renWin = vtkRenderWindow::New();
renWin->SetMultiSamples(0);
iren->SetRenderWindow(renWin);
iren->SetInteractorStyle(style);
renWin->Delete();
style->Delete();
vtkImageReader2 *reader = vtkImageReader2::New();
reader->SetDataByteOrderToLittleEndian();
reader->SetDataExtent(0, 63, 0, 63, 1, 93);
// use negative spacing to strengthen the testing
reader->SetDataSpacing(3.2, 3.2, -1.5);
// a nice random-ish origin for testing
reader->SetDataOrigin(2.5, -13.6, 2.8);
char* fname = vtkTestUtilities::ExpandDataFileName(
argc, argv, "Data/headsq/quarter");
reader->SetFilePrefix(fname);
reader->Update();
delete[] fname;
vtkRenderer *renderers[4];
for (int i = 0; i < 4; i++)
{
vtkRenderer *renderer = vtkRenderer::New();
renderers[i] = renderer;
vtkCamera *camera = renderer->GetActiveCamera();
renderer->SetBackground(0.1, 0.2, 0.4);
renderer->SetViewport(0.5*(i&1), 0.25*(i&2),
0.5 + 0.5*(i&1), 0.5 + 0.25*(i&2));
renWin->AddRenderer(renderer);
renderer->Delete();
vtkImageSliceMapper *imageMapper = vtkImageSliceMapper::New();
imageMapper->SetInputConnection(reader->GetOutputPort());
imageMapper->SliceAtFocalPointOn();
double *bounds = imageMapper->GetBounds();
double point[3];
point[0] = 0.5*(bounds[0] + bounds[1]);
point[1] = 0.5*(bounds[2] + bounds[3]);
point[2] = 0.5*(bounds[4] + bounds[5]);
if (i < 3)
{
imageMapper->SetOrientation(i);
}
point[imageMapper->GetOrientation()] += 30.0;
camera->SetFocalPoint(point);
point[imageMapper->GetOrientation()] += 470.0;
camera->SetPosition(point);
camera->SetClippingRange(250, 750);
camera->ParallelProjectionOn();
camera->SetParallelScale(120.0);
if (imageMapper->GetOrientation() != 2)
{
camera->SetViewUp(0.0, 0.0, 1.0);
}
if (i == 3)
{
camera->Azimuth(30);
camera->Elevation(40);
}
vtkImageSlice *image = vtkImageSlice::New();
image->SetMapper(imageMapper);
imageMapper->Delete();
renderer->AddViewProp(image);
image->GetProperty()->SetColorWindow(2000);
image->GetProperty()->SetColorLevel(1000);
image->Delete();
}
renWin->SetSize(400,400);
renWin->Render();
// a cone source that points along the z axis
vtkConeSource *coneSource = vtkConeSource::New();
coneSource->CappingOn();
coneSource->SetHeight(24);
coneSource->SetRadius(8);
coneSource->SetResolution(31);
coneSource->SetCenter(12, 0, 0);
coneSource->SetDirection(-1, 0, 0);
vtkCellPicker *picker = vtkCellPicker::New();
picker->SetTolerance(1e-6);
const static int pickpos[4][2] = {
{ 120, 90 },
{ 278, 99 },
{ 90, 310 },
{ 250, 260 }
};
bool pickSuccess = true;
for (int i = 0; i < 4; i++)
{
vtkRenderer *renderer = renderers[i];
// Pick the image
picker->Pick(pickpos[i][0], pickpos[i][1], 0.0, renderer);
double p[3], n[3];
picker->GetPickPosition(p);
picker->GetPickNormal(n);
if (vtkImageSlice::SafeDownCast(picker->GetProp3D()) == 0)
{
cerr << "Pick did not get an image.\n";
pickSuccess = false;
}
if (vtkImageSliceMapper::SafeDownCast(picker->GetMapper()) == 0)
{
cerr << "Pick did not get a mapper.\n";
pickSuccess = false;
}
// Draw a cone where the pick occurred
vtkActor *coneActor = vtkActor::New();
coneActor->PickableOff();
vtkDataSetMapper *coneMapper = vtkDataSetMapper::New();
coneMapper->SetInputConnection(coneSource->GetOutputPort());
coneActor->SetMapper(coneMapper);
coneActor->GetProperty()->SetColor(1, 0, 0);
coneActor->SetPosition(p[0], p[1], p[2]);
PointCone(coneActor, n[0], n[1], n[2]);
renderer->AddViewProp(coneActor);
coneMapper->Delete();
coneActor->Delete();
}
renWin->Render();
int retVal = vtkRegressionTestImage( renWin );
if ( retVal == vtkRegressionTester::DO_INTERACTOR )
{
iren->Start();
}
iren->Delete();
coneSource->Delete();
picker->Delete();
reader->Delete();
return (!retVal || !pickSuccess);
}
......@@ -46,12 +46,12 @@
class vtkCocoaRenderWindowInteractor;
// Type declarations
typedef vtkCocoaRenderWindow* vtkCocoaRenderWindowRef;
typedef vtkCocoaRenderWindowInteractor* vtkCocoaRenderWindowInteractorRef;
typedef vtkCocoaRenderWindow *vtkCocoaRenderWindowRef;
typedef vtkCocoaRenderWindowInteractor *vtkCocoaRenderWindowInteractorRef;
#else
// Type declarations
typedef void* vtkCocoaRenderWindowRef;
typedef void* vtkCocoaRenderWindowInteractorRef;
typedef void *vtkCocoaRenderWindowRef;
typedef void *vtkCocoaRenderWindowInteractorRef;
#endif
@interface vtkCocoaGLView : NSView
......
......@@ -25,6 +25,7 @@
@implementation vtkCocoaGLView
//----------------------------------------------------------------------------
// Private
- (void)emptyMethod:(id)sender
{
(void)sender;
......@@ -74,7 +75,7 @@
{
if (_myVTKRenderWindow)
{
return (vtkCocoaRenderWindowInteractor*)_myVTKRenderWindow->GetInteractor();
return (vtkCocoaRenderWindowInteractor *)_myVTKRenderWindow->GetInteractor();
}
else
{
......@@ -95,6 +96,7 @@
}
//----------------------------------------------------------------------------
// Private
- (void)clearTrackingRect
{
// remove any tracking rect we have
......@@ -106,6 +108,7 @@
}
//----------------------------------------------------------------------------
// Private
- (void)resetTrackingRect
{
//clear out the old tracking rect
......@@ -184,7 +187,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -256,7 +259,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -324,7 +327,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -407,7 +410,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -452,7 +455,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -487,7 +490,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -522,7 +525,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -565,7 +568,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -595,7 +598,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
interactor->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
NSApplication* application = [NSApplication sharedApplication];
NSApplication *application = [NSApplication sharedApplication];
NSDate* infinity = [NSDate distantFuture];
do
{
......@@ -643,7 +646,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -673,7 +676,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
interactor->InvokeEvent(vtkCommand::RightButtonPressEvent,NULL);
NSApplication* application = [NSApplication sharedApplication];
NSApplication *application = [NSApplication sharedApplication];
NSDate* infinity = [NSDate distantFuture];
do
{
......@@ -721,7 +724,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
return;
}
vtkCocoaRenderWindow* renWin =
vtkCocoaRenderWindow *renWin =
vtkCocoaRenderWindow::SafeDownCast([self getVTKRenderWindow]);
if (!renWin)
......@@ -751,7 +754,7 @@ static const char *vtkMacKeyCodeToKeySymTable[128] = {
interactor->InvokeEvent(vtkCommand::MiddleButtonPressEvent,NULL);
NSApplication* application = [NSApplication sharedApplication];
NSApplication *application = [NSApplication sharedApplication];
NSDate* infinity = [NSDate distantFuture];
do
{
......
......@@ -314,6 +314,9 @@ protected:
void SetCocoaManager(void *manager);
void *GetCocoaManager();
void SetCocoaServer(void *server); // Really a vtkCocoaServer*
void *GetCocoaServer();
private:
vtkCocoaRenderWindow(const vtkCocoaRenderWindow&); // Not implemented.
void operator=(const vtkCocoaRenderWindow&); // Not implemented.
......
This diff is collapsed.
......@@ -106,8 +106,6 @@ protected:
// by this class.
void SetTimerDictionary(void *dictionary); // Really an NSMutableDictionary*
void *GetTimerDictionary();
void SetCocoaServer(void *server); // Really a vtkCocoaServer*
void *GetCocoaServer();
//BTX
// Description:
......
......@@ -1028,6 +1028,7 @@ int vtkOpenGLRenderWindow::SetRGBAPixelData(int x1, int y1, int x2, int y2,
height = abs(y_hi-y_low) + 1;
/* write out a row of pixels */
glDisable( GL_ALPHA_TEST );
glDisable( GL_SCISSOR_TEST );
glViewport(0, 0, this->Size[0], this->Size[1]);
glMatrixMode( GL_MODELVIEW );
......@@ -1356,12 +1357,13 @@ int vtkOpenGLRenderWindow::SetRGBACharPixelData(int x1, int y1, int x2,
glMatrixMode( GL_MODELVIEW );
glPopMatrix();
glDisable( GL_ALPHA_TEST );
glDisable( GL_SCISSOR_TEST );
// Disable writing on the z-buffer.
glDepthMask(GL_FALSE);
glDisable(GL_DEPTH_TEST);
glDisable( GL_SCISSOR_TEST );
// Turn of texturing in case it is on - some drivers have a problem
// getting / setting pixels with texturing enabled.
glDisable( GL_TEXTURE_2D );
......@@ -1555,9 +1557,11 @@ int vtkOpenGLRenderWindow::SetZbufferData( int x1, int y1, int x2, int y2,
glMatrixMode( GL_MODELVIEW );
glPopMatrix();
glDisable( GL_ALPHA_TEST );
glDisable( GL_SCISSOR_TEST );
// Turn of texturing in case it is on - some drivers have a problem
// getting / setting pixels with texturing enabled.
glDisable( GL_SCISSOR_TEST );
glDisable( GL_TEXTURE_2D );
glPixelStorei( GL_PACK_ALIGNMENT, 1 );
......
......@@ -275,7 +275,7 @@ void vtkFixedPointCompositeGOHelperGenerateImageIndependentNN( T *data,
VTKKWRCHelper_CroppingCheckNN( pos );
unsigned char mag[4];
unsigned char mag[4] = { 1, 1, 1, 1 };
for ( c = 0; c < components; c++ )
{
val[c] = static_cast<unsigned short>(((*(dptr+c)) + shift[c])*scale[c]);
......
......@@ -291,7 +291,7 @@ void vtkFixedPointCompositeGOShadeHelperGenerateImageIndependentNN( T *data,
VTKKWRCHelper_CroppingCheckNN( pos );
unsigned short normal[4];
unsigned char mag[4];
unsigned char mag[4] = { 1, 1, 1, 1};
for ( c = 0; c < components; c++ )
{
val[c] = static_cast<unsigned short>(((*(dptr+c)) + shift[c])*scale[c]);
......
......@@ -28,6 +28,8 @@ set(lib_js_min_files
)
set(widgets_js_min_files
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-analysis-cost.js"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-analysis-bench.js"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-viewer.js"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-resampler-viewer.js"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-composite.js"
......@@ -39,6 +41,8 @@ set(widgets_js_min_files
"${widgets_source_dir}/TreeWidget/vtkweb-widget-tree.js"
)
set(widgets_css_min_files
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-analysis-cost.css"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-analysis-bench.css"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-viewer.css"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-resampler-viewer.css"
"${widgets_source_dir}/CatalystBrowser/vtkweb-widget-catalyst-composite.css"
......
/* -------------------------------------------- */
/* Sub menu */
/* -------------------------------------------- */