[vtk6] 01/06: Remove all patches to prepare for update to 6.3.0
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Apr 5 14:28:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository vtk6.
commit b864c36e20ce58864287a0724fec9359c3f9137e
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Tue Apr 5 09:33:38 2016 +0000
Remove all patches to prepare for update to 6.3.0
---
CMake/GenerateExportHeader.cmake | 2 +-
CMake/vtkCompilerExtras.cmake | 2 +-
CMake/vtkJavaWrapping.cmake | 2 +-
CMake/vtkModuleMacros.cmake | 4 +-
CMake/vtkTestFFMPEG.cmake | 4 +-
Common/Core/Testing/Cxx/CMakeLists.txt | 1 -
Common/Core/vtkAbstractArray.h | 2 +-
Common/Core/vtkLookupTable.cxx | 22 +---
Common/Core/vtkLookupTable.h | 7 +-
Common/Core/vtkMath.h | 6 +-
Common/Core/vtkUnicodeString.cxx | 48 +++----
Examples/Infovis/Cxx/CMakeLists.txt | 5 +
Filters/ParallelMPI/vtkDistributedDataFilter.cxx | 48 ++-----
IO/Core/vtkUTF8TextCodec.cxx | 4 +-
IO/FFMPEG/vtkFFMPEGWriter.cxx | 20 +--
IO/GDAL/vtkGDALVectorReader.cxx | 12 --
IO/SQL/vtkSQLiteDatabase.cxx | 22 ++--
IO/SQL/vtkSQLiteDatabase.h | 4 +-
IO/SQL/vtkSQLiteQuery.cxx | 144 ++++++++++-----------
IO/SQL/vtkSQLiteQuery.h | 4 +-
Parallel/MPI4Py/CMakeLists.txt | 2 +-
Parallel/MPI4Py/module.cmake | 2 +
.../Matplotlib/vtkMatplotlibMathTextUtilities.h | 4 -
Rendering/Tk/CMakeLists.txt | 2 +-
ThirdParty/sqlite/CMakeLists.txt | 3 +-
Utilities/Doxygen/doxyfile.in | 1 -
Wrapping/Java/CMakeLists.txt | 2 -
Wrapping/Tcl/vtkTkAppInit.cxx | 2 -
28 files changed, 163 insertions(+), 218 deletions(-)
diff --git a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
index abc62cd..ecfae31 100644
--- a/CMake/GenerateExportHeader.cmake
+++ b/CMake/GenerateExportHeader.cmake
@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility)
execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
- string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
+ string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
_gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
index 91105a1..4e0ea4e 100644
--- a/CMake/vtkCompilerExtras.cmake
+++ b/CMake/vtkCompilerExtras.cmake
@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
+ string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
_gcc_version "${_gcc_version_info}")
if(NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
diff --git a/CMake/vtkJavaWrapping.cmake b/CMake/vtkJavaWrapping.cmake
index 45ae0b1..4cbd0a2 100644
--- a/CMake/vtkJavaWrapping.cmake
+++ b/CMake/vtkJavaWrapping.cmake
@@ -79,7 +79,7 @@ function(vtk_add_java_wrapping module_name module_srcs module_hdrs)
install(TARGETS ${module_name}Java
EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR}/jni COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development)
endif()
endfunction()
diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake
index b6143b8..14d21da 100644
--- a/CMake/vtkModuleMacros.cmake
+++ b/CMake/vtkModuleMacros.cmake
@@ -401,8 +401,8 @@ endfunction()
function(vtk_target_name _name)
get_property(_type TARGET ${_name} PROPERTY TYPE)
if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL)
- set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION})
- set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
+ set_property(TARGET ${_name} PROPERTY VERSION 1)
+ set_property(TARGET ${_name} PROPERTY SOVERSION 1)
endif()
if("${_name}" MATCHES "^[Vv][Tt][Kk]")
set(_vtk "")
diff --git a/CMake/vtkTestFFMPEG.cmake b/CMake/vtkTestFFMPEG.cmake
index a33cce2..7cba9f3 100644
--- a/CMake/vtkTestFFMPEG.cmake
+++ b/CMake/vtkTestFFMPEG.cmake
@@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR)
#include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h>
int main()
{
- img_convert(0, AV_PIX_FMT_RGB24,
- 0, AV_PIX_FMT_RGB24,
+ img_convert(0, PIX_FMT_RGB24,
+ 0, PIX_FMT_RGB24,
0, 0);
return 0;
}\n")
diff --git a/Common/Core/Testing/Cxx/CMakeLists.txt b/Common/Core/Testing/Cxx/CMakeLists.txt
index 5638440..c43ab1b 100644
--- a/Common/Core/Testing/Cxx/CMakeLists.txt
+++ b/Common/Core/Testing/Cxx/CMakeLists.txt
@@ -32,7 +32,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
TestGarbageCollector.cxx
# TestInstantiator.cxx # Have not enabled instantiators.
TestLookupTable.cxx
- TestLookupTableThreaded.cxx
TestMath.cxx
TestMinimalStandardRandomSequence.cxx
TestNew.cxx
diff --git a/Common/Core/vtkAbstractArray.h b/Common/Core/vtkAbstractArray.h
index 9f53c2c..f9c9f13 100644
--- a/Common/Core/vtkAbstractArray.h
+++ b/Common/Core/vtkAbstractArray.h
@@ -381,7 +381,7 @@ public:
// prominence P, we sample N values, with N = f(T; P, U).
// We want f to be sublinear in T in order to interactively handle large
// arrays; in practice, we can make f independent of T:
- // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}\right) \f$,
+ // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}) \f$,
// but note that small values of P are costly to achieve.
// The default parameters will locate prominent values that occur at least
// 1 out of every 1000 samples with a confidence of 0.999999 (= 1 - 1e6).
diff --git a/Common/Core/vtkLookupTable.cxx b/Common/Core/vtkLookupTable.cxx
index 2d90054..53d9663 100644
--- a/Common/Core/vtkLookupTable.cxx
+++ b/Common/Core/vtkLookupTable.cxx
@@ -18,7 +18,6 @@
#include "vtkBitArray.h"
#include "vtkMath.h"
#include "vtkMathConfigure.h"
-#include "vtkMutexLock.h"
#include "vtkObjectFactory.h"
#include "vtkStringArray.h"
#include "vtkVariantArray.h"
@@ -82,8 +81,6 @@ vtkLookupTable::vtkLookupTable(int sze, int ext)
this->Scale = VTK_SCALE_LINEAR;
this->OpaqueFlag=1;
-
- this->ResizeMutex = vtkSimpleMutexLock::New();
}
//----------------------------------------------------------------------------
@@ -91,7 +88,6 @@ vtkLookupTable::~vtkLookupTable()
{
this->Table->UnRegister( this );
this->Table = NULL;
- this->ResizeMutex->Delete();
}
//----------------------------------------------------------------------------
@@ -645,8 +641,8 @@ namespace {
//----------------------------------------------------------------------------
template<class T>
-void vtkLookupTableMapData(vtkLookupTable *self, vtkSimpleMutexLock *mutex,
- T *input, unsigned char *output, int length,
+void vtkLookupTableMapData(vtkLookupTable *self, T *input,
+ unsigned char *output, int length,
int inIncr, int outFormat, TableParameters & p)
{
int i = length;
@@ -658,24 +654,14 @@ void vtkLookupTableMapData(vtkLookupTable *self, vtkSimpleMutexLock *mutex,
// end. When this function is called repeatedly with the same size
// lookup table, memory reallocation will be done only one the first
// call if at all.
-
vtkUnsignedCharArray* lookupTable = self->GetTable();
vtkIdType numberOfColors = lookupTable->GetNumberOfTuples();
vtkIdType neededSize = (numberOfColors + vtkLookupTable::NUMBER_OF_SPECIAL_COLORS) *
lookupTable->GetNumberOfComponents();
-
- // Since this involves a potential array resize and this function
- // might be accessed concurently from more than one thread, we need a
- // mutex here. This shouldn't affect performance much if this function
- // is used to map many input values, but if it is called repeatedly
- // with short input arrays, performance may be much worse.
- mutex->Lock();
if (lookupTable->GetSize() < neededSize)
{
lookupTable->Resize(numberOfColors + vtkLookupTable::NUMBER_OF_SPECIAL_COLORS);
}
- mutex->Unlock();
-
unsigned char* table = lookupTable->GetPointer(0);
// Writing directly to the memory location instead of adding them
@@ -1173,7 +1159,7 @@ void vtkLookupTable::MapScalarsThroughTable2(void *input,
{
newInput->SetValue(i, bitArray->GetValue(id));
}
- vtkLookupTableMapData(this, this->ResizeMutex,
+ vtkLookupTableMapData(this,
static_cast<unsigned char*>(newInput->GetPointer(0)),
output, numberOfValues,
inputIncrement, outputFormat, p);
@@ -1183,7 +1169,7 @@ void vtkLookupTable::MapScalarsThroughTable2(void *input,
break;
vtkTemplateMacro(
- vtkLookupTableMapData(this, this->ResizeMutex, static_cast<VTK_TT*>(input),output,
+ vtkLookupTableMapData(this,static_cast<VTK_TT*>(input),output,
numberOfValues, inputIncrement, outputFormat, p)
);
default:
diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h
index d0401df..f233c85 100644
--- a/Common/Core/vtkLookupTable.h
+++ b/Common/Core/vtkLookupTable.h
@@ -56,8 +56,6 @@
#include "vtkUnsignedCharArray.h" // Needed for inline method
-class vtkSimpleMutexLock;
-
#define VTK_RAMP_LINEAR 0
#define VTK_RAMP_SCURVE 1
#define VTK_RAMP_SQRT 2
@@ -361,8 +359,6 @@ protected:
int OpaqueFlag;
vtkTimeStamp OpaqueFlagBuildTime;
- vtkSimpleMutexLock* ResizeMutex;
-
private:
vtkLookupTable(const vtkLookupTable&); // Not implemented.
void operator=(const vtkLookupTable&); // Not implemented.
@@ -377,3 +373,6 @@ inline unsigned char *vtkLookupTable::WritePointer(const vtkIdType id,
}
#endif
+
+
+
diff --git a/Common/Core/vtkMath.h b/Common/Core/vtkMath.h
index 72b784e..a357d56 100644
--- a/Common/Core/vtkMath.h
+++ b/Common/Core/vtkMath.h
@@ -669,14 +669,14 @@ public:
// The output is provided by overwriting the input A with a matrix of the same size as
// A containing all of the information about L and U. If the output matrix is
// \f$ A* = \left( \begin{array}{cc}
- // a & b \\
+ // a & b \\ %
// c & d \end{array} \right)\f$
// then L and U can be obtained as:
// \f$ L = \left( \begin{array}{cc}
- // 1 & 0 \\
+ // 1 & 0 \\ %
// c & 1 \end{array} \right)\f$
// \f$ U = \left( \begin{array}{cc}
- // a & b \\
+ // a & b \\ %
// 0 & d \end{array} \right)\f$
//
// That is, the diagonal of the resulting A* is the diagonal of U. The upper right
diff --git a/Common/Core/vtkUnicodeString.cxx b/Common/Core/vtkUnicodeString.cxx
index b537d9b..cc6d7ff 100644
--- a/Common/Core/vtkUnicodeString.cxx
+++ b/Common/Core/vtkUnicodeString.cxx
@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_iterator(std::string::const_iterator pos
vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
{
- return utf8::unchecked::peek_next(this->Position);
+ return vtk_utf8::unchecked::peek_next(this->Position);
}
bool vtkUnicodeString::const_iterator::operator==(const const_iterator& rhs) const
@@ -56,27 +56,27 @@ bool vtkUnicodeString::const_iterator::operator!=(const const_iterator& rhs) con
vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator++()
{
- utf8::unchecked::next(this->Position);
+ vtk_utf8::unchecked::next(this->Position);
return *this;
}
vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator++(int)
{
const_iterator result(this->Position);
- utf8::unchecked::next(this->Position);
+ vtk_utf8::unchecked::next(this->Position);
return result;
}
vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator--()
{
- utf8::unchecked::prior(this->Position);
+ vtk_utf8::unchecked::prior(this->Position);
return *this;
}
vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator--(int)
{
const_iterator result(this->Position);
- utf8::unchecked::prior(this->Position);
+ vtk_utf8::unchecked::prior(this->Position);
return result;
}
@@ -134,7 +134,7 @@ vtkUnicodeString::vtkUnicodeString(const vtkUnicodeString& rhs) :
vtkUnicodeString::vtkUnicodeString(size_type count, value_type character)
{
for(size_type i = 0; i != count; ++i)
- utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
+ vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
}
vtkUnicodeString::vtkUnicodeString(const_iterator first, const_iterator last) :
@@ -149,7 +149,7 @@ bool vtkUnicodeString::is_utf8(const char* value)
bool vtkUnicodeString::is_utf8(const std::string& value)
{
- return utf8::is_valid(value.begin(), value.end());
+ return vtk_utf8::is_valid(value.begin(), value.end());
}
vtkUnicodeString vtkUnicodeString::from_utf8(const char* value)
@@ -160,7 +160,7 @@ vtkUnicodeString vtkUnicodeString::from_utf8(const char* value)
vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end)
{
vtkUnicodeString result;
- if(utf8::is_valid(begin, end))
+ if(vtk_utf8::is_valid(begin, end))
{
result.Storage = std::string(begin, end);
}
@@ -174,7 +174,7 @@ vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end)
vtkUnicodeString vtkUnicodeString::from_utf8(const std::string& value)
{
vtkUnicodeString result;
- if(utf8::is_valid(value.begin(), value.end()))
+ if(vtk_utf8::is_valid(value.begin(), value.end()))
{
result.Storage = value;
}
@@ -197,9 +197,9 @@ vtkUnicodeString vtkUnicodeString::from_utf16(const vtkTypeUInt16* value)
try
{
- utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
+ vtk_utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
}
- catch(utf8::invalid_utf16&)
+ catch(vtk_utf8::invalid_utf16&)
{
vtkGenericWarningMacro(<< "vtkUnicodeString::from_utf16(): not a valid UTF-16 string.");
}
@@ -233,15 +233,15 @@ vtkUnicodeString::value_type vtkUnicodeString::at(size_type offset) const
throw std::out_of_range("character out-of-range");
std::string::const_iterator iterator = this->Storage.begin();
- utf8::unchecked::advance(iterator, offset);
- return utf8::unchecked::peek_next(iterator);
+ vtk_utf8::unchecked::advance(iterator, offset);
+ return vtk_utf8::unchecked::peek_next(iterator);
}
vtkUnicodeString::value_type vtkUnicodeString::operator[](size_type offset) const
{
std::string::const_iterator iterator = this->Storage.begin();
- utf8::unchecked::advance(iterator, offset);
- return utf8::unchecked::peek_next(iterator);
+ vtk_utf8::unchecked::advance(iterator, offset);
+ return vtk_utf8::unchecked::peek_next(iterator);
}
const char* vtkUnicodeString::utf8_str() const
@@ -257,14 +257,14 @@ void vtkUnicodeString::utf8_str(std::string& result) const
std::vector<vtkTypeUInt16> vtkUnicodeString::utf16_str() const
{
std::vector<vtkTypeUInt16> result;
- utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
+ vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
return result;
}
void vtkUnicodeString::utf16_str(std::vector<vtkTypeUInt16>& result) const
{
result.clear();
- utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
+ vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
}
vtkUnicodeString::size_type vtkUnicodeString::byte_count() const
@@ -274,7 +274,7 @@ vtkUnicodeString::size_type vtkUnicodeString::byte_count() const
vtkUnicodeString::size_type vtkUnicodeString::character_count() const
{
- return utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
+ return vtk_utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
}
bool vtkUnicodeString::empty() const
@@ -300,9 +300,9 @@ void vtkUnicodeString::push_back(value_type character)
{
try
{
- utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
+ vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
}
- catch(utf8::invalid_code_point&)
+ catch(vtk_utf8::invalid_code_point&)
{
vtkGenericWarningMacro("vtkUnicodeString::push_back(): " << character << "is not a valid Unicode code point");
}
@@ -319,7 +319,7 @@ void vtkUnicodeString::append(size_type count, value_type character)
{
this->Storage.append(vtkUnicodeString(count, character).Storage);
}
- catch(utf8::invalid_code_point&)
+ catch(vtk_utf8::invalid_code_point&)
{
vtkGenericWarningMacro("vtkUnicodeString::append(): " << character << "is not a valid Unicode code point");
}
@@ -345,7 +345,7 @@ void vtkUnicodeString::assign(size_type count, value_type character)
{
this->Storage.assign(vtkUnicodeString(count, character).Storage);
}
- catch(utf8::invalid_code_point&)
+ catch(vtk_utf8::invalid_code_point&)
{
vtkGenericWarningMacro("vtkUnicodeString::assign(): " << character << "is not a valid Unicode code point");
}
@@ -415,11 +415,11 @@ vtkUnicodeString vtkUnicodeString::substr(size_type offset, size_type count) con
std::string::const_iterator last = this->Storage.end();
while(from != last && offset--)
- utf8::unchecked::advance(from, 1);
+ vtk_utf8::unchecked::advance(from, 1);
std::string::const_iterator to = from;
while(to != last && count--)
- utf8::unchecked::advance(to, 1);
+ vtk_utf8::unchecked::advance(to, 1);
return vtkUnicodeString(from, to);
}
diff --git a/Examples/Infovis/Cxx/CMakeLists.txt b/Examples/Infovis/Cxx/CMakeLists.txt
index 2dfa0d2..9da2599 100644
--- a/Examples/Infovis/Cxx/CMakeLists.txt
+++ b/Examples/Infovis/Cxx/CMakeLists.txt
@@ -26,6 +26,11 @@ if(vtkViewsInfovis_LOADED)
endif()
# If Qt is enabled include the QT based examples
+if(vtkGUISupportQt_LOADED)
+ add_subdirectory(EasyView)
+ add_subdirectory(CustomLinkView)
+ add_subdirectory(StatsView)
+endif()
if(vtkInfovisParallel_LOADED)
add_executable(ParallelBFS ParallelBFS.cxx)
diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
index 1f76120..3b76a81 100644
--- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
@@ -1079,10 +1079,7 @@ vtkDataSet *vtkDistributedDataFilter::TestFixTooFewInputFiles(vtkDataSet *input)
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
-
- if (sizeof(vtkIdList *) * nprocs > 0) {
- memset(sendCells, 0, sizeof(vtkIdList *) * nprocs);
- }
+ memset(sendCells, 0, sizeof(vtkIdList *) * nprocs);
if (numConsumers == nprocs - 1)
{
@@ -1567,9 +1564,7 @@ vtkFloatArray **
// Exchange int arrays
float **recvArrays = new float * [nprocs];
- if (sizeof(float *) * nprocs > 0) {
- memset(recvArrays, 0, sizeof(float *) * nprocs);
- }
+ memset(recvArrays, 0, sizeof(float *) * nprocs);
if (sendSize[me] > 0) // sent myself an array
{
@@ -1691,9 +1686,7 @@ vtkIdTypeArray **
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
- if (sizeof(vtkIdType *) * nprocs > 0) {
- memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs);
- }
+ memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs);
if (sendSize[me] > 0) // sent myself an array
{
@@ -2796,9 +2789,7 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharPointArray(
unsigned char *vals = new unsigned char [npoints];
- if (npoints > 0) {
- memset(vals, val, npoints);
- }
+ memset(vals, val, npoints);
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
@@ -2818,9 +2809,7 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharCellArray(
unsigned char *vals = new unsigned char [ncells];
- if (ncells > 0) {
- memset(vals, val, ncells);
- }
+ memset(vals, val, ncells);
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
@@ -3019,9 +3008,7 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid)
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
- if (sizeof(vtkIdType) * nprocs > 0) {
- memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs);
- }
+ memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs);
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
@@ -3103,16 +3090,10 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid)
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
-
- if (sizeof(vtkFloatArray *) * nprocs > 0) {
- memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs);
- }
+ memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs);
vtkIdTypeArray **localIds = new vtkIdTypeArray * [nprocs];
-
- if (sizeof(vtkIdTypeArray *) * nprocs > 0) {
- memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
- }
+ memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
@@ -3287,9 +3268,7 @@ vtkIdTypeArray **vtkDistributedDataFilter::FindGlobalPointIds(
{
// There are no cells in my assigned region
- if (sizeof(vtkIdTypeArray *) * nprocs > 0) {
- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
- }
+ memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
return gids;
}
@@ -3494,10 +3473,7 @@ vtkIdTypeArray **vtkDistributedDataFilter::MakeProcessLists(
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
-
- if (sizeof (vtkIdTypeArray *) * nprocs > 0) {
- memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs);
- }
+ memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs);
for (int i=0; i<nprocs; i++)
{
@@ -3587,9 +3563,7 @@ vtkIdTypeArray **vtkDistributedDataFilter::GetGhostPointIds(
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
- if (sizeof(vtkIdTypeArray *) * nprocs) {
- memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
- }
+ memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
if (numPoints < 1)
{
diff --git a/IO/Core/vtkUTF8TextCodec.cxx b/IO/Core/vtkUTF8TextCodec.cxx
index 458fda7..a75a9ea 100644
--- a/IO/Core/vtkUTF8TextCodec.cxx
+++ b/IO/Core/vtkUTF8TextCodec.cxx
@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8TextCodec::NextUnicode(istream& InputStream)
throw(std::string("End of Input"));
}
- getSize = utf8::internal::sequence_length(c);
+ getSize = vtk_utf8::internal::sequence_length(c);
if (0 == getSize)
throw(std::string("Not enough space"));
@@ -138,7 +138,7 @@ vtkUnicodeString::value_type vtkUTF8TextCodec::NextUnicode(istream& InputStream)
istream::char_type* c1 = c;
- const vtkTypeUInt32 code_point = utf8::next(c1, &c[getSize]);
+ const vtkTypeUInt32 code_point = vtk_utf8::next(c1, &c[getSize]);
return code_point;
}
diff --git a/IO/FFMPEG/vtkFFMPEGWriter.cxx b/IO/FFMPEG/vtkFFMPEGWriter.cxx
index 9476dcd..ed9e5b6 100644
--- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
@@ -189,11 +189,11 @@ int vtkFFMPEGWriterInternal::Start()
c->height = this->Dim[1];
if (this->Writer->GetCompression())
{
- c->pix_fmt = AV_PIX_FMT_YUVJ422P;
+ c->pix_fmt = PIX_FMT_YUVJ422P;
}
else
{
- c->pix_fmt = AV_PIX_FMT_BGR24;
+ c->pix_fmt = PIX_FMT_BGR24;
}
//to do playback at actual recorded rate, this will need more work see also below
@@ -272,13 +272,13 @@ int vtkFFMPEGWriterInternal::Start()
#endif
//for the output of the writer's input...
- this->rgbInput = av_frame_alloc();
+ this->rgbInput = avcodec_alloc_frame();
if (!this->rgbInput)
{
vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
return 0;
}
- int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height);
+ int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height);
unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize);
if (!rgb)
{
@@ -286,10 +286,10 @@ int vtkFFMPEGWriterInternal::Start()
return 0;
}
//The rgb buffer should get deleted when this->rgbInput is.
- avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height);
+ avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
//and for the output to the codec's input.
- this->yuvOutput = av_frame_alloc();
+ this->yuvOutput = avcodec_alloc_frame();
if (!this->yuvOutput)
{
vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
@@ -347,12 +347,12 @@ int vtkFFMPEGWriterInternal::Write(vtkImageData *id)
//convert that to YUV for input to the codec
#ifdef VTK_FFMPEG_HAS_IMG_CONVERT
img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
- (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24,
+ (AVPicture *)this->rgbInput, PIX_FMT_RGB24,
cc->width, cc->height);
#else
//convert that to YUV for input to the codec
SwsContext* convert_ctx = sws_getContext(
- cc->width, cc->height, AV_PIX_FMT_RGB24,
+ cc->width, cc->height, PIX_FMT_RGB24,
cc->width, cc->height, cc->pix_fmt,
SWS_BICUBIC, NULL, NULL, NULL);
@@ -445,14 +445,14 @@ void vtkFFMPEGWriterInternal::End()
if (this->yuvOutput)
{
av_free(this->yuvOutput->data[0]);
- av_frame_free(&this->yuvOutput);
+ av_free(this->yuvOutput);
this->yuvOutput = NULL;
}
if (this->rgbInput)
{
av_free(this->rgbInput->data[0]);
- av_frame_free(&this->rgbInput);
+ av_free(this->rgbInput);
this->rgbInput = NULL;
}
diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx
index 1c559c0..e0b8976 100644
--- a/IO/GDAL/vtkGDALVectorReader.cxx
+++ b/IO/GDAL/vtkGDALVectorReader.cxx
@@ -44,11 +44,7 @@ class vtkGDALVectorReader::Internal
public:
Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds )
{
-#if GDAL_VERSION_MAJOR < 2
this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver );
-#else
- this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL );
-#endif
if ( ! this->Source )
{
this->LastError = CPLGetLastErrorMsg();
@@ -65,11 +61,7 @@ public:
{
if ( this->Source )
{
-#if GDAL_VERSION_MAJOR < 2
OGRDataSource::DestroyDataSource( this->Source );
-#else
- GDALClose( (GDALDatasetH) this->Source );
-#endif
}
}
@@ -315,11 +307,7 @@ public:
return nCells;
}
-#if GDAL_VERSION_MAJOR < 2
OGRDataSource* Source;
-#else
- GDALDataset* Source;
-#endif
OGRSFDriver* Driver;
const char* LastError;
int LayerIdx;
diff --git a/IO/SQL/vtkSQLiteDatabase.cxx b/IO/SQL/vtkSQLiteDatabase.cxx
index 403c82d..473c6e7 100644
--- a/IO/SQL/vtkSQLiteDatabase.cxx
+++ b/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
-#include <sqlite3.h>
+#include <vtksqlite/vtk_sqlite3.h>
vtkStandardNewMacro(vtkSQLiteDatabase);
@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode)
}
}
- int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
+ int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
- if (result != SQLITE_OK)
+ if (result != VTK_SQLITE_OK)
{
vtkDebugMacro(<<"SQLite open() failed. Error code is "
<< result << " and message is "
- << sqlite3_errmsg(this->SQLiteInstance) );
+ << vtk_sqlite3_errmsg(this->SQLiteInstance) );
- sqlite3_close(this->SQLiteInstance);
+ vtk_sqlite3_close(this->SQLiteInstance);
return false;
}
else
@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close()
}
else
{
- int result = sqlite3_close(this->SQLiteInstance);
- if (result != SQLITE_OK)
+ int result = vtk_sqlite3_close(this->SQLiteInstance);
+ if (result != VTK_SQLITE_OK)
{
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
}
@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetTables()
if (!status)
{
vtkErrorMacro(<< "GetTables(): Database returned error: "
- << sqlite3_errmsg(this->SQLiteInstance) );
+ << vtk_sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return this->Tables;
}
@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetRecord(const char *table)
if (!status)
{
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
- << sqlite3_errmsg(this->SQLiteInstance) );
+ << vtk_sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return NULL;
}
@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const char* URL)
// ----------------------------------------------------------------------
bool vtkSQLiteDatabase::HasError()
{
- return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK);
+ return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK);
}
const char* vtkSQLiteDatabase::GetLastErrorText()
{
- return sqlite3_errmsg(this->SQLiteInstance);
+ return vtk_sqlite3_errmsg(this->SQLiteInstance);
}
diff --git a/IO/SQL/vtkSQLiteDatabase.h b/IO/SQL/vtkSQLiteDatabase.h
index 3e8cd57..640355a 100644
--- a/IO/SQL/vtkSQLiteDatabase.h
+++ b/IO/SQL/vtkSQLiteDatabase.h
@@ -49,7 +49,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
class vtkStringArray;
-struct sqlite3;
+struct vtk_sqlite3;
class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
{
@@ -147,7 +147,7 @@ protected:
virtual bool ParseURL(const char* url);
private:
- sqlite3 *SQLiteInstance;
+ vtk_sqlite3 *SQLiteInstance;
// We want this to be private, a user of this class
// should not be setting this for any reason
diff --git a/IO/SQL/vtkSQLiteQuery.cxx b/IO/SQL/vtkSQLiteQuery.cxx
index 57654a3..614f47b 100644
--- a/IO/SQL/vtkSQLiteQuery.cxx
+++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <sqlite3.h>
+#include <vtksqlite/vtk_sqlite3.h>
#include <cassert>
@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
{
this->Statement = NULL;
this->InitialFetch = true;
- this->InitialFetchResult=SQLITE_DONE;
+ this->InitialFetchResult=VTK_SQLITE_DONE;
this->LastErrorText = NULL;
this->TransactionInProgress = false;
}
@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
{
if (this->Database != NULL)
{
- sqlite3_finalize(this->Statement);
+ vtk_sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
}
@@ -131,8 +131,8 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery)
if (this->Statement)
{
vtkDebugMacro(<<"Finalizing old statement");
- int finalizeStatus = sqlite3_finalize(this->Statement);
- if (finalizeStatus != SQLITE_OK)
+ int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
+ if (finalizeStatus != VTK_SQLITE_OK)
{
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
<< finalizeStatus);
@@ -151,19 +151,19 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery)
return false;
}
- sqlite3 *db = dbContainer->SQLiteInstance;
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
const char *unused_statement;
- int prepareStatus = sqlite3_prepare_v2(db,
+ int prepareStatus = vtk_sqlite3_prepare_v2(db,
this->Query,
static_cast<int>(strlen(this->Query)),
&this->Statement,
&unused_statement);
- if (prepareStatus != SQLITE_OK)
+ if (prepareStatus != VTK_SQLITE_OK)
{
- this->SetLastErrorText(sqlite3_errmsg(db));
- vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
+ this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+ vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
@@ -194,31 +194,31 @@ bool vtkSQLiteQuery::Execute()
}
else
{
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
vtkDebugMacro(<<"Execute(): Query ready to execute.");
this->InitialFetch = true;
- int result = sqlite3_step(this->Statement);
+ int result = vtk_sqlite3_step(this->Statement);
this->InitialFetchResult = result;
- if (result == SQLITE_DONE)
+ if (result == VTK_SQLITE_DONE)
{
this->SetLastErrorText(NULL);
this->Active = true;
return true;
}
- else if (result != SQLITE_ROW)
+ else if (result != VTK_SQLITE_ROW)
{
vtkSQLiteDatabase *dbContainer =
vtkSQLiteDatabase::SafeDownCast(this->Database);
assert(dbContainer != NULL);
- sqlite3 *db = dbContainer->SQLiteInstance;
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(sqlite3_errmsg(db));
- vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
+ this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+ vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
<< this->GetLastErrorText());
this->Active = false;
return false;
@@ -239,7 +239,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
}
else
{
- return sqlite3_column_count(this->Statement);
+ return vtk_sqlite3_column_count(this->Statement);
}
}
@@ -259,7 +259,7 @@ const char * vtkSQLiteQuery::GetFieldName(int column)
}
else
{
- return sqlite3_column_name(this->Statement, column);
+ return vtk_sqlite3_column_name(this->Statement, column);
}
}
@@ -279,22 +279,22 @@ int vtkSQLiteQuery::GetFieldType(int column)
}
else
{
- switch (sqlite3_column_type(this->Statement, column))
+ switch (vtk_sqlite3_column_type(this->Statement, column))
{
- case SQLITE_INTEGER:
+ case VTK_SQLITE_INTEGER:
return VTK_INT;
- case SQLITE_FLOAT:
+ case VTK_SQLITE_FLOAT:
return VTK_FLOAT;
- case SQLITE_TEXT:
+ case VTK_SQLITE_TEXT:
return VTK_STRING;
- case SQLITE_BLOB:
+ case VTK_SQLITE_BLOB:
return VTK_STRING; // until we have a BLOB type of our own
- case SQLITE_NULL:
+ case VTK_SQLITE_NULL:
return VTK_VOID; // ??? what makes sense here?
default:
{
vtkErrorMacro(<<"GetFieldType(): Unknown data type "
- << sqlite3_column_type(this->Statement, column)
+ << vtk_sqlite3_column_type(this->Statement, column)
<<" from SQLite.");
return VTK_VOID;
}
@@ -315,7 +315,7 @@ bool vtkSQLiteQuery::NextRow()
{
vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
this->InitialFetch = false;
- if (this->InitialFetchResult == SQLITE_DONE)
+ if (this->InitialFetchResult == VTK_SQLITE_DONE)
{
return false;
}
@@ -326,12 +326,12 @@ bool vtkSQLiteQuery::NextRow()
}
else
{
- int result = sqlite3_step(this->Statement);
- if (result == SQLITE_DONE)
+ int result = vtk_sqlite3_step(this->Statement);
+ if (result == VTK_SQLITE_DONE)
{
return false;
}
- else if (result == SQLITE_ROW)
+ else if (result == VTK_SQLITE_ROW)
{
return true;
}
@@ -339,8 +339,8 @@ bool vtkSQLiteQuery::NextRow()
{
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- sqlite3 *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(sqlite3_errmsg(db));
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ this->SetLastErrorText(vtk_sqlite3_errmsg(db));
vtkErrorMacro(<<"NextRow(): Database returned error code "
<< result << " with the following message: "
<< this->GetLastErrorText());
@@ -366,33 +366,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column)
}
else
{
- switch (sqlite3_column_type(this->Statement, column))
+ switch (vtk_sqlite3_column_type(this->Statement, column))
{
- case SQLITE_INTEGER:
- return vtkVariant(sqlite3_column_int(this->Statement, column));
+ case VTK_SQLITE_INTEGER:
+ return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
- case SQLITE_FLOAT:
- return vtkVariant(sqlite3_column_double(this->Statement, column));
+ case VTK_SQLITE_FLOAT:
+ return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
- case SQLITE_TEXT:
+ case VTK_SQLITE_TEXT:
{
vtksys_ios::ostringstream str;
- str << sqlite3_column_text(this->Statement, column);
+ str << vtk_sqlite3_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
- case SQLITE_BLOB:
+ case VTK_SQLITE_BLOB:
{
// This is a hack ... by passing the BLOB to vtkStdString with an explicit
// byte count, we ensure that the string will store all of the BLOB's bytes,
// even if there are NULL values.
return vtkVariant(vtkStdString(
- static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
- sqlite3_column_bytes(this->Statement, column)));
+ static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
+ vtk_sqlite3_column_bytes(this->Statement, column)));
}
- case SQLITE_NULL:
+ case VTK_SQLITE_NULL:
default:
return vtkVariant();
}
@@ -423,11 +423,11 @@ bool vtkSQLiteQuery::BeginTransaction()
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- sqlite3 *db = dbContainer->SQLiteInstance;
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == SQLITE_OK)
+ if (result == VTK_SQLITE_OK)
{
this->TransactionInProgress = true;
this->SetLastErrorText(NULL);
@@ -451,7 +451,7 @@ bool vtkSQLiteQuery::CommitTransaction()
{
if (this->Statement)
{
- sqlite3_finalize(this->Statement);
+ vtk_sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
@@ -463,11 +463,11 @@ bool vtkSQLiteQuery::CommitTransaction()
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- sqlite3 *db = dbContainer->SQLiteInstance;
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == SQLITE_OK)
+ if (result == VTK_SQLITE_OK)
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
@@ -499,11 +499,11 @@ bool vtkSQLiteQuery::RollbackTransaction()
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- sqlite3 *db = dbContainer->SQLiteInstance;
+ vtk_sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == SQLITE_OK)
+ if (result == VTK_SQLITE_OK)
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
@@ -647,11 +647,11 @@ bool vtkSQLiteQuery::BindIntegerParameter(int index, int value)
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
- int status = sqlite3_bind_int(this->Statement, index+1, value);
+ int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
@@ -676,11 +676,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(int index, vtkTypeInt64 value)
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
- int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
+ int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
@@ -705,12 +705,12 @@ bool vtkSQLiteQuery::BindDoubleParameter(int index, double value)
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
- int status = sqlite3_bind_double(this->Statement, index+1, value);
+ int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
@@ -734,12 +734,12 @@ bool vtkSQLiteQuery::BindStringParameter(int index, const char *value, int lengt
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
- int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
+ int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
@@ -763,17 +763,17 @@ bool vtkSQLiteQuery::BindBlobParameter(int index, const void *data, int length)
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
int status =
- sqlite3_bind_blob(this->Statement,
+ vtk_sqlite3_bind_blob(this->Statement,
index+1,
data,
length,
- SQLITE_TRANSIENT);
+ VTK_SQLITE_TRANSIENT);
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
@@ -797,12 +797,12 @@ bool vtkSQLiteQuery::ClearParameterBindings()
if (this->Active)
{
this->Active = false;
- sqlite3_reset(this->Statement);
+ vtk_sqlite3_reset(this->Statement);
}
- int status = sqlite3_clear_bindings(this->Statement);
+ int status = vtk_sqlite3_clear_bindings(this->Statement);
- if (status != SQLITE_OK)
+ if (status != VTK_SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
diff --git a/IO/SQL/vtkSQLiteQuery.h b/IO/SQL/vtkSQLiteQuery.h
index db4deb4..bfab39a 100644
--- a/IO/SQL/vtkSQLiteQuery.h
+++ b/IO/SQL/vtkSQLiteQuery.h
@@ -47,7 +47,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
class vtkVariantArray;
-struct sqlite3_stmt;
+struct vtk_sqlite3_stmt;
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
@@ -155,7 +155,7 @@ private:
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
void operator=(const vtkSQLiteQuery &); // Not implemented.
- sqlite3_stmt *Statement;
+ vtk_sqlite3_stmt *Statement;
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
diff --git a/Parallel/MPI4Py/CMakeLists.txt b/Parallel/MPI4Py/CMakeLists.txt
index f7d620d..dde5b31 100644
--- a/Parallel/MPI4Py/CMakeLists.txt
+++ b/Parallel/MPI4Py/CMakeLists.txt
@@ -17,7 +17,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
mark_as_advanced(MPI4PY_INCLUDE_DIR)
endif()
else()
- set(MPI4PY_INCLUDE_DIR "/usr/include")
+ set(MPI4PY_INCLUDE_DIR "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include")
endif()
include_directories("${MPI4PY_INCLUDE_DIR}")
diff --git a/Parallel/MPI4Py/module.cmake b/Parallel/MPI4Py/module.cmake
index 27e3d49..b90fd30 100644
--- a/Parallel/MPI4Py/module.cmake
+++ b/Parallel/MPI4Py/module.cmake
@@ -5,6 +5,8 @@ if (VTK_WRAP_PYTHON)
DEPENDS
vtkParallelMPI
vtkPython
+ COMPILE_DEPENDS
+ vtkmpi4py
EXCLUDE_FROM_TCL_WRAPPING
EXCLUDE_FROM_JAVA_WRAPPING
KIT
diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
index c4cacc7..c133e27 100644
--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
@@ -132,10 +132,6 @@ protected:
// Function used to check MPL availability and update MPLMathTextAvailable.
// This will do tests only the first time this method is called.
static void CheckMPLAvailability();
- static void DisableMPL()
- {
- MPLMathTextAvailable = UNAVAILABLE;
- };
private:
vtkMatplotlibMathTextUtilities(const vtkMatplotlibMathTextUtilities&); // Not implemented.
diff --git a/Rendering/Tk/CMakeLists.txt b/Rendering/Tk/CMakeLists.txt
index 7bf1194..0b94cd3 100644
--- a/Rendering/Tk/CMakeLists.txt
+++ b/Rendering/Tk/CMakeLists.txt
@@ -122,7 +122,7 @@ if(TK_FOUND AND VTK_USE_TK)
vtk_target_install(vtkRenderingPythonTkWidgets)
set_property(TARGET vtkRenderingPythonTkWidgets PROPERTY OUTPUT_NAME
- vtkRenderingPythonTkWidgets)
+ vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES})
if(VTK_USE_X)
diff --git a/ThirdParty/sqlite/CMakeLists.txt b/ThirdParty/sqlite/CMakeLists.txt
index a09c7c5..9e1c067 100644
--- a/ThirdParty/sqlite/CMakeLists.txt
+++ b/ThirdParty/sqlite/CMakeLists.txt
@@ -1,3 +1,4 @@
set(vtksqlite_THIRD_PARTY 1)
-set(vtksqlite_LIBRARIES sqlite3)
+set(vtksqlite_LIBRARIES vtksqlite)
vtk_module_export_info()
+add_subdirectory(vtksqlite)
diff --git a/Utilities/Doxygen/doxyfile.in b/Utilities/Doxygen/doxyfile.in
index ecde8bd..ad5e41c 100644
--- a/Utilities/Doxygen/doxyfile.in
+++ b/Utilities/Doxygen/doxyfile.in
@@ -22,7 +22,6 @@ PDF_HYPERLINKS = YES
HAVE_DOT = @HAVE_DOT_YESNO@
DOT_PATH = "@DOT_PATH@"
-DOT_IMAGE_FORMAT = svg
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt
index a6a1cff..a19f75f 100644
--- a/Wrapping/Java/CMakeLists.txt
+++ b/Wrapping/Java/CMakeLists.txt
@@ -80,8 +80,6 @@ if(APPLE)
set(JAVAC_OPTIONS -J-Xmx512m)
endif()
-set(JAVAC_OPTIONS -J-Xmx1024m)
-
get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED)
foreach(module IN LISTS java_modules)
if(NOT ${module}_EXCLUDE_FROM_WRAPPING)
diff --git a/Wrapping/Tcl/vtkTkAppInit.cxx b/Wrapping/Tcl/vtkTkAppInit.cxx
index c1ea1a1..f2b96f0 100644
--- a/Wrapping/Tcl/vtkTkAppInit.cxx
+++ b/Wrapping/Tcl/vtkTkAppInit.cxx
@@ -165,8 +165,6 @@ int Tcl_AppInit(Tcl_Interp *interp)
// Help Tcl find the Tcl/Tk helper files.
const char* relative_dirs[] =
{
- "../share/tcltk",
- "../../share/tcltk",
"TclTk/lib",
".." VTK_INSTALL_TCL_DIR,
0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list