[vtk7] 04/24: update 50_use_system_utf8.patch
Gert Wollny
gewo at moszumanska.debian.org
Sun Jul 9 08:00:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository vtk7.
commit f9c00598909376c4d91c30ea8bd483b2ed93eebb
Author: Gert Wollny <gewo at debian.org>
Date: Sat Jul 8 10:16:20 2017 +0000
update 50_use_system_utf8.patch
---
debian/patches/50_use_system_utf8.patch | 86 ++++++++++++++++-----------------
1 file changed, 41 insertions(+), 45 deletions(-)
diff --git a/debian/patches/50_use_system_utf8.patch b/debian/patches/50_use_system_utf8.patch
index ee398ab..3253e94 100644
--- a/debian/patches/50_use_system_utf8.patch
+++ b/debian/patches/50_use_system_utf8.patch
@@ -25,11 +25,9 @@ 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.3.0/Common/Core/vtkUnicodeString.cxx
-===================================================================
---- VTK-6.3.0.orig/Common/Core/vtkUnicodeString.cxx
-+++ VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
-@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_
+--- a/Common/Core/vtkUnicodeString.cxx
++++ b/Common/Core/vtkUnicodeString.cxx
+@@ -41,7 +41,7 @@
vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
{
@@ -38,7 +36,7 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
bool vtkUnicodeString::const_iterator::operator==(const const_iterator& rhs) const
-@@ -56,27 +56,27 @@ bool vtkUnicodeString::const_iterator::o
+@@ -56,27 +56,27 @@
vtkUnicodeString::const_iterator& vtkUnicodeString::const_iterator::operator++()
{
@@ -70,7 +68,7 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
return result;
}
-@@ -134,7 +134,7 @@ vtkUnicodeString::vtkUnicodeString(const
+@@ -134,7 +134,7 @@
vtkUnicodeString::vtkUnicodeString(size_type count, value_type character)
{
for(size_type i = 0; i != count; ++i)
@@ -79,7 +77,7 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
vtkUnicodeString::vtkUnicodeString(const_iterator first, const_iterator last) :
-@@ -149,7 +149,7 @@ bool vtkUnicodeString::is_utf8(const cha
+@@ -149,7 +149,7 @@
bool vtkUnicodeString::is_utf8(const std::string& value)
{
@@ -88,37 +86,37 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
vtkUnicodeString vtkUnicodeString::from_utf8(const char* value)
-@@ -160,7 +160,7 @@ vtkUnicodeString vtkUnicodeString::from_
+@@ -160,7 +160,7 @@
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_
+ }
+@@ -174,7 +174,7 @@
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_
+ }
+@@ -197,9 +197,9 @@
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
+ }
+@@ -233,15 +233,15 @@
throw std::out_of_range("character out-of-range");
std::string::const_iterator iterator = this->Storage.begin();
@@ -138,7 +136,7 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
const char* vtkUnicodeString::utf8_str() const
-@@ -257,14 +257,14 @@ void vtkUnicodeString::utf8_str(std::str
+@@ -257,14 +257,14 @@
std::vector<vtkTypeUInt16> vtkUnicodeString::utf16_str() const
{
std::vector<vtkTypeUInt16> result;
@@ -155,7 +153,7 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
vtkUnicodeString::size_type vtkUnicodeString::byte_count() const
-@@ -274,7 +274,7 @@ vtkUnicodeString::size_type vtkUnicodeSt
+@@ -274,7 +274,7 @@
vtkUnicodeString::size_type vtkUnicodeString::character_count() const
{
@@ -164,37 +162,37 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
}
bool vtkUnicodeString::empty() const
-@@ -300,9 +300,9 @@ void vtkUnicodeString::push_back(value_t
+@@ -300,9 +300,9 @@
{
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
- {
+ }
+@@ -319,7 +319,7 @@
+ {
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
- {
+ }
+@@ -345,7 +345,7 @@
+ {
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
+ }
+@@ -415,11 +415,11 @@
std::string::const_iterator last = this->Storage.end();
while(from != last && offset--)
@@ -208,20 +206,18 @@ Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
return vtkUnicodeString(from, to);
}
-Index: VTK-6.3.0/IO/Core/vtkUTF8TextCodec.cxx
-===================================================================
---- VTK-6.3.0.orig/IO/Core/vtkUTF8TextCodec.cxx
-+++ VTK-6.3.0/IO/Core/vtkUTF8TextCodec.cxx
-@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8Text
+--- a/IO/Core/vtkUTF8TextCodec.cxx
++++ b/IO/Core/vtkUTF8TextCodec.cxx
+@@ -124,7 +124,7 @@
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
+@@ -138,7 +138,7 @@
istream::char_type* c1 = c;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git
More information about the debian-science-commits
mailing list