[vtk6] 02/05: Update/remove patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Mar 24 19:43:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository vtk6.
commit 4bc3890e85952557f5d35ec693ee7a5a55df0835
Author: Anton Gladky <gladk at debian.org>
Date: Tue Mar 24 20:35:30 2015 +0100
Update/remove patches.
---
debian/patches/allpatches.patch | 16 +--
debian/patches/fix_ftbfs_gcc49.patch | 26 ++--
debian/patches/matplotlib.patch | 8 +-
debian/patches/series | 18 +--
debian/patches/soversion-sharedlib.patch | 18 ++-
debian/patches/use_system_mpi4py.patch | 49 +++++++
debian/patches/use_system_sqlite.patch | 31 +++--
debian/patches/use_system_utf8.patch | 228 +++++++++++++++++++++++++++++++
8 files changed, 334 insertions(+), 60 deletions(-)
diff --git a/debian/patches/allpatches.patch b/debian/patches/allpatches.patch
index 44e288c..16d7b78 100644
--- a/debian/patches/allpatches.patch
+++ b/debian/patches/allpatches.patch
@@ -30,11 +30,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: vtk-6.0.0/Utilities/Doxygen/doxyfile.in
+Index: VTK-6.2.0/Utilities/Doxygen/doxyfile.in
===================================================================
---- vtk-6.0.0.orig/Utilities/Doxygen/doxyfile.in 2013-10-08 08:46:11.000000000 +0200
-+++ vtk-6.0.0/Utilities/Doxygen/doxyfile.in 2013-10-08 08:46:11.000000000 +0200
-@@ -22,6 +22,7 @@
+--- VTK-6.2.0.orig/Utilities/Doxygen/doxyfile.in
++++ VTK-6.2.0/Utilities/Doxygen/doxyfile.in
+@@ -22,6 +22,7 @@ PDF_HYPERLINKS = YES
HAVE_DOT = @HAVE_DOT_YESNO@
DOT_PATH = "@DOT_PATH@"
@@ -42,11 +42,11 @@ Index: vtk-6.0.0/Utilities/Doxygen/doxyfile.in
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
-Index: vtk-6.0.0/Wrapping/Tcl/vtkTkAppInit.cxx
+Index: VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx
===================================================================
---- vtk-6.0.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx 2013-10-08 08:46:11.000000000 +0200
-+++ vtk-6.0.0/Wrapping/Tcl/vtkTkAppInit.cxx 2013-10-08 08:46:11.000000000 +0200
-@@ -165,6 +165,8 @@
+--- VTK-6.2.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx
++++ VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx
+@@ -165,6 +165,8 @@ int Tcl_AppInit(Tcl_Interp *interp)
// Help Tcl find the Tcl/Tk helper files.
const char* relative_dirs[] =
{
diff --git a/debian/patches/fix_ftbfs_gcc49.patch b/debian/patches/fix_ftbfs_gcc49.patch
index 1116a28..e1dd6ec 100644
--- a/debian/patches/fix_ftbfs_gcc49.patch
+++ b/debian/patches/fix_ftbfs_gcc49.patch
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/746923
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
---- vtk6-6.1.0+dfsg.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ vtk6-6.1.0+dfsg/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1094,7 +1094,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+===================================================================
+--- VTK-6.2.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1079,7 +1079,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -18,7 +20,7 @@ Last-Update: 2014-05-30
if (numConsumers == nprocs - 1)
{
-@@ -1585,7 +1588,9 @@ vtkFloatArray **
+@@ -1564,7 +1567,9 @@ vtkFloatArray **
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -29,7 +31,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -1706,7 +1711,9 @@ vtkIdTypeArray **
+@@ -1686,7 +1691,9 @@ vtkIdTypeArray **
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -40,7 +42,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -2810,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2789,7 +2796,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [npoints];
@@ -51,7 +53,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2830,7 +2839,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2809,7 +2818,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [ncells];
@@ -62,7 +64,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3027,7 +3038,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3008,7 +3019,9 @@ int vtkDistributedDataFilter::AssignGlob
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -73,7 +75,7 @@ Last-Update: 2014-05-30
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3109,10 +3122,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3090,10 +3103,16 @@ int vtkDistributedDataFilter::AssignGlob
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -92,7 +94,7 @@ Last-Update: 2014-05-30
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3287,7 +3306,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3268,7 +3287,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
{
// There are no cells in my assigned region
@@ -103,7 +105,7 @@ Last-Update: 2014-05-30
return gids;
}
-@@ -3492,7 +3513,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3473,7 +3494,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -115,7 +117,7 @@ Last-Update: 2014-05-30
for (int i=0; i<nprocs; i++)
{
-@@ -3582,7 +3606,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3563,7 +3587,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
diff --git a/debian/patches/matplotlib.patch b/debian/patches/matplotlib.patch
index ab9e071..d2e45d7 100644
--- a/debian/patches/matplotlib.patch
+++ b/debian/patches/matplotlib.patch
@@ -1,6 +1,8 @@
---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -117,6 +117,10 @@
+Index: VTK-6.2.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+===================================================================
+--- VTK-6.2.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ VTK-6.2.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -132,6 +132,10 @@ 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();
diff --git a/debian/patches/series b/debian/patches/series
index 0939cc4..71619e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,7 @@
allpatches.patch
soversion-sharedlib.patch
-vtkTclWrapper.patch
-vtkWrapJava.patch
matplotlib.patch
-docs.patch
-fix_libav10.patch
-10_Java_Target.patch
-fix_FTBFS_KWSys.patch
-fix_ftbfs_gcc49.patch
-use_system_xdmf.patch
use_system_sqlite.patch
-
-# Temporarly disable system_alglib
-# use_system_alglib.patch
-wxpython3.0.patch
-
-fix_GLintptr_FTBFS.patch
-freetype-update.patch
+fix_ftbfs_gcc49.patch
+use_system_utf8.patch
+use_system_mpi4py.patch
diff --git a/debian/patches/soversion-sharedlib.patch b/debian/patches/soversion-sharedlib.patch
index a6e95c0..a20e395 100644
--- a/debian/patches/soversion-sharedlib.patch
+++ b/debian/patches/soversion-sharedlib.patch
@@ -1,7 +1,9 @@
---- a/CMake/vtkModuleMacros.cmake
-+++ b/CMake/vtkModuleMacros.cmake
-@@ -341,8 +341,8 @@
- macro(vtk_target_name _name)
+Index: VTK-6.2.0/CMake/vtkModuleMacros.cmake
+===================================================================
+--- VTK-6.2.0.orig/CMake/vtkModuleMacros.cmake
++++ VTK-6.2.0/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 1)
@@ -11,9 +13,11 @@
endif()
if("${_name}" MATCHES "^[Vv][Tt][Kk]")
set(_vtk "")
---- a/Rendering/Tk/CMakeLists.txt
-+++ b/Rendering/Tk/CMakeLists.txt
-@@ -122,7 +122,7 @@
+Index: VTK-6.2.0/Rendering/Tk/CMakeLists.txt
+===================================================================
+--- VTK-6.2.0.orig/Rendering/Tk/CMakeLists.txt
++++ VTK-6.2.0/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
diff --git a/debian/patches/use_system_mpi4py.patch b/debian/patches/use_system_mpi4py.patch
new file mode 100644
index 0000000..6c0b1f3
--- /dev/null
+++ b/debian/patches/use_system_mpi4py.patch
@@ -0,0 +1,49 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk6 (6.2.0-1) unstable; urgency=medium
+ .
+ [ James Cowgill ]
+ * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802)
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/779802
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk6-6.2.0.orig/Parallel/MPI4Py/CMakeLists.txt
++++ vtk6-6.2.0/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 "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include")
++ set(MPI4PY_INCLUDE_DIR "/usr/include")
+ endif()
+ include_directories("${MPI4PY_INCLUDE_DIR}")
+
+--- vtk6-6.2.0.orig/Parallel/MPI4Py/module.cmake
++++ vtk6-6.2.0/Parallel/MPI4Py/module.cmake
+@@ -5,8 +5,6 @@ if (VTK_WRAP_PYTHON)
+ DEPENDS
+ vtkParallelMPI
+ vtkPython
+- COMPILE_DEPENDS
+- vtkmpi4py
+ EXCLUDE_FROM_TCL_WRAPPING
+ EXCLUDE_FROM_JAVA_WRAPPING
+ KIT
diff --git a/debian/patches/use_system_sqlite.patch b/debian/patches/use_system_sqlite.patch
index 5dc85c9..f0e3222 100644
--- a/debian/patches/use_system_sqlite.patch
+++ b/debian/patches/use_system_sqlite.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750183
Last-Update: 2014-06-03
-Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteDatabase.cxx
+Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
===================================================================
---- vtk6-6.1.0+dfsg.orig/IO/SQL/vtkSQLiteDatabase.cxx
-+++ vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteDatabase.cxx
+--- VTK-6.2.0.orig/IO/SQL/vtkSQLiteDatabase.cxx
++++ VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
@@ -78,10 +78,10 @@ Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteDatabase.cxx
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
-Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.cxx
+Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
===================================================================
---- vtk6-6.1.0+dfsg.orig/IO/SQL/vtkSQLiteQuery.cxx
-+++ vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.cxx
+--- VTK-6.2.0.orig/IO/SQL/vtkSQLiteQuery.cxx
++++ VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
@@ -467,10 +467,10 @@ Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
-Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.h
+Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
===================================================================
---- vtk6-6.1.0+dfsg.orig/IO/SQL/vtkSQLiteQuery.h
-+++ vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.h
+--- VTK-6.2.0.orig/IO/SQL/vtkSQLiteQuery.h
++++ VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
@@ -47,7 +47,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
@@ -489,19 +489,20 @@ Index: vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteQuery.h
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
-Index: vtk6-6.1.0+dfsg/ThirdParty/sqlite/CMakeLists.txt
+Index: VTK-6.2.0/ThirdParty/sqlite/CMakeLists.txt
===================================================================
---- vtk6-6.1.0+dfsg.orig/ThirdParty/sqlite/CMakeLists.txt
-+++ vtk6-6.1.0+dfsg/ThirdParty/sqlite/CMakeLists.txt
+--- VTK-6.2.0.orig/ThirdParty/sqlite/CMakeLists.txt
++++ VTK-6.2.0/ThirdParty/sqlite/CMakeLists.txt
@@ -1,4 +1,3 @@
set(vtksqlite_THIRD_PARTY 1)
-set(vtksqlite_LIBRARIES vtksqlite)
+set(vtksqlite_LIBRARIES sqlite3)
vtk_module_export_info()
-add_subdirectory(vtksqlite)
-
---- vtk6-6.1.0+dfsg.orig/IO/SQL/vtkSQLiteDatabase.h
-+++ vtk6-6.1.0+dfsg/IO/SQL/vtkSQLiteDatabase.h
+Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.h
+===================================================================
+--- VTK-6.2.0.orig/IO/SQL/vtkSQLiteDatabase.h
++++ VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.h
@@ -49,7 +49,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
diff --git a/debian/patches/use_system_utf8.patch b/debian/patches/use_system_utf8.patch
new file mode 100644
index 0000000..ed73941
--- /dev/null
+++ b/debian/patches/use_system_utf8.patch
@@ -0,0 +1,228 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk6 (6.2.0-1) unstable; urgency=medium
+ .
+ [ James Cowgill ]
+ * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802)
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/779802
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk6-6.2.0.orig/Common/Core/vtkUnicodeString.cxx
++++ vtk6-6.2.0/Common/Core/vtkUnicodeString.cxx
+@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_
+
+ vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
+ {
+- return vtk_utf8::unchecked::peek_next(this->Position);
++ return utf8::unchecked::peek_next(this->Position);
+ }
+
+ bool vtkUnicodeString::const_iterator::operator==(const const_iterator& rhs) const
+@@ -56,27 +56,27 @@ bool vtkUnicodeString::const_iterator::o
+
+ vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator++()
+ {
+- vtk_utf8::unchecked::next(this->Position);
++ utf8::unchecked::next(this->Position);
+ return *this;
+ }
+
+ vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator++(int)
+ {
+ const_iterator result(this->Position);
+- vtk_utf8::unchecked::next(this->Position);
++ utf8::unchecked::next(this->Position);
+ return result;
+ }
+
+ vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator--()
+ {
+- vtk_utf8::unchecked::prior(this->Position);
++ utf8::unchecked::prior(this->Position);
+ return *this;
+ }
+
+ vtkUnicodeString::const_iterator vtkUnicodeString::const_iterator::operator--(int)
+ {
+ const_iterator result(this->Position);
+- vtk_utf8::unchecked::prior(this->Position);
++ utf8::unchecked::prior(this->Position);
+ return result;
+ }
+
+@@ -134,7 +134,7 @@ vtkUnicodeString::vtkUnicodeString(const
+ vtkUnicodeString::vtkUnicodeString(size_type count, value_type character)
+ {
+ for(size_type i = 0; i != count; ++i)
+- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
++ 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 cha
+
+ bool vtkUnicodeString::is_utf8(const std::string& value)
+ {
+- return vtk_utf8::is_valid(value.begin(), value.end());
++ return utf8::is_valid(value.begin(), value.end());
+ }
+
+ vtkUnicodeString vtkUnicodeString::from_utf8(const char* value)
+@@ -160,7 +160,7 @@ vtkUnicodeString vtkUnicodeString::from_
+ vtkUnicodeString vtkUnicodeString::from_utf8(const char* begin, const char* end)
+ {
+ vtkUnicodeString result;
+- if(vtk_utf8::is_valid(begin, end))
++ if(utf8::is_valid(begin, end))
+ {
+ result.Storage = std::string(begin, end);
+ }
+@@ -174,7 +174,7 @@ vtkUnicodeString vtkUnicodeString::from_
+ vtkUnicodeString vtkUnicodeString::from_utf8(const std::string& value)
+ {
+ vtkUnicodeString result;
+- if(vtk_utf8::is_valid(value.begin(), value.end()))
++ if(utf8::is_valid(value.begin(), value.end()))
+ {
+ result.Storage = value;
+ }
+@@ -197,9 +197,9 @@ vtkUnicodeString vtkUnicodeString::from_
+
+ try
+ {
+- vtk_utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
++ utf8::utf16to8(value, value + length, vtkUnicodeString::back_insert_iterator(result.Storage));
+ }
+- catch(vtk_utf8::invalid_utf16&)
++ catch(utf8::invalid_utf16&)
+ {
+ vtkGenericWarningMacro(<< "vtkUnicodeString::from_utf16(): not a valid UTF-16 string.");
+ }
+@@ -233,15 +233,15 @@ vtkUnicodeString::value_type vtkUnicodeS
+ throw std::out_of_range("character out-of-range");
+
+ std::string::const_iterator iterator = this->Storage.begin();
+- vtk_utf8::unchecked::advance(iterator, offset);
+- return vtk_utf8::unchecked::peek_next(iterator);
++ utf8::unchecked::advance(iterator, offset);
++ return utf8::unchecked::peek_next(iterator);
+ }
+
+ vtkUnicodeString::value_type vtkUnicodeString::operator[](size_type offset) const
+ {
+ std::string::const_iterator iterator = this->Storage.begin();
+- vtk_utf8::unchecked::advance(iterator, offset);
+- return vtk_utf8::unchecked::peek_next(iterator);
++ utf8::unchecked::advance(iterator, offset);
++ return utf8::unchecked::peek_next(iterator);
+ }
+
+ const char* vtkUnicodeString::utf8_str() const
+@@ -257,14 +257,14 @@ void vtkUnicodeString::utf8_str(std::str
+ std::vector<vtkTypeUInt16> vtkUnicodeString::utf16_str() const
+ {
+ std::vector<vtkTypeUInt16> result;
+- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
++ 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();
+- vtk_utf8::unchecked::utf8to16(this->Storage.begin(), this->Storage.end(), std::back_inserter(result));
++ 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 vtkUnicodeSt
+
+ vtkUnicodeString::size_type vtkUnicodeString::character_count() const
+ {
+- return vtk_utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
++ return utf8::unchecked::distance(this->Storage.begin(), this->Storage.end());
+ }
+
+ bool vtkUnicodeString::empty() const
+@@ -300,9 +300,9 @@ void vtkUnicodeString::push_back(value_t
+ {
+ try
+ {
+- vtk_utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
++ utf8::append(character, vtkUnicodeString::back_insert_iterator(this->Storage));
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(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
+ {
+ this->Storage.append(vtkUnicodeString(count, character).Storage);
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(utf8::invalid_code_point&)
+ {
+ vtkGenericWarningMacro("vtkUnicodeString::append(): " << character << "is not a valid Unicode code point");
+ }
+@@ -345,7 +345,7 @@ void vtkUnicodeString::assign(size_type
+ {
+ this->Storage.assign(vtkUnicodeString(count, character).Storage);
+ }
+- catch(vtk_utf8::invalid_code_point&)
++ catch(utf8::invalid_code_point&)
+ {
+ vtkGenericWarningMacro("vtkUnicodeString::assign(): " << character << "is not a valid Unicode code point");
+ }
+@@ -415,11 +415,11 @@ vtkUnicodeString vtkUnicodeString::subst
+ std::string::const_iterator last = this->Storage.end();
+
+ while(from != last && offset--)
+- vtk_utf8::unchecked::advance(from, 1);
++ utf8::unchecked::advance(from, 1);
+
+ std::string::const_iterator to = from;
+ while(to != last && count--)
+- vtk_utf8::unchecked::advance(to, 1);
++ utf8::unchecked::advance(to, 1);
+
+ return vtkUnicodeString(from, to);
+ }
+--- vtk6-6.2.0.orig/IO/Core/vtkUTF8TextCodec.cxx
++++ vtk6-6.2.0/IO/Core/vtkUTF8TextCodec.cxx
+@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8Text
+ throw(std::string("End of Input"));
+ }
+
+- getSize = vtk_utf8::internal::sequence_length(c);
++ getSize = utf8::internal::sequence_length(c);
+
+ if (0 == getSize)
+ throw(std::string("Not enough space"));
+@@ -138,7 +138,7 @@ vtkUnicodeString::value_type vtkUTF8Text
+
+ istream::char_type* c1 = c;
+
+- const vtkTypeUInt32 code_point = vtk_utf8::next(c1, &c[getSize]);
++ const vtkTypeUInt32 code_point = utf8::next(c1, &c[getSize]);
+
+ return code_point;
+ }
--
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