parent
aa48f41db3
commit
69e87bf4d9
@ -0,0 +1,41 @@
|
|||||||
|
--- ./Testing/Source/Common/Cxx/TestString2.cxx.orig 2019-02-26 22:01:26.738230841 +0000
|
||||||
|
+++ ./Testing/Source/Common/Cxx/TestString2.cxx 2019-02-26 22:59:07.751826144 +0000
|
||||||
|
@@ -16,7 +16,6 @@
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
#include <string.h> // strlen
|
||||||
|
-#include <stdio.h> // EOF
|
||||||
|
|
||||||
|
int TestString2(int , char *[])
|
||||||
|
{
|
||||||
|
@@ -26,24 +25,24 @@ int TestString2(int , char *[])
|
||||||
|
gdcm::String<> s2 = "coucou!";
|
||||||
|
std::cout << s2 << " -> " << s2.size() << std::endl;
|
||||||
|
|
||||||
|
- gdcm::String<EOF,64,0> s3 = "coucou";
|
||||||
|
+ gdcm::String<'\\',64,0> s3 = "coucou";
|
||||||
|
std::cout << s3.c_str() << " -> " << s3.size() << std::endl;
|
||||||
|
|
||||||
|
- gdcm::String<EOF,64,0> s4 = "coucou!";
|
||||||
|
+ gdcm::String<'\\',64,0> s4 = "coucou!";
|
||||||
|
std::cout << s4.c_str() << " -> " << s4.size() << std::endl;
|
||||||
|
|
||||||
|
const char *s = "coucou!";
|
||||||
|
- gdcm::String<EOF,64,0> s5( s, strlen(s) );
|
||||||
|
+ gdcm::String<'\\',64,0> s5( s, strlen(s) );
|
||||||
|
std::cout << s5.c_str() << " -> " << s5.size() << std::endl;
|
||||||
|
|
||||||
|
std::string ss = "coucou!";
|
||||||
|
- gdcm::String<EOF,64,0> s6( ss );
|
||||||
|
+ gdcm::String<'\\',64,0> s6( ss );
|
||||||
|
std::cout << s6.c_str() << " -> " << s6.size() << std::endl;
|
||||||
|
|
||||||
|
- gdcm::String<EOF,64,0> s7( ss, 1, 5 );
|
||||||
|
+ gdcm::String<'\\',64,0> s7( ss, 1, 5 );
|
||||||
|
std::cout << s7.c_str() << " -> " << s7.size() << std::endl;
|
||||||
|
|
||||||
|
- gdcm::String<EOF,64,0> s8( ss, 1, 6 );
|
||||||
|
+ gdcm::String<'\\',64,0> s8( ss, 1, 6 );
|
||||||
|
std::cout << s8.c_str() << " -> " << s8.size() << std::endl;
|
||||||
|
|
||||||
|
return 0;
|
@ -1,11 +0,0 @@
|
|||||||
--- ./Source/Common/gdcmString.h.orig 2019-02-25 17:28:26.424232122 +0000
|
|
||||||
+++ ./Source/Common/gdcmString.h 2019-02-25 17:28:57.986168143 +0000
|
|
||||||
@@ -27,7 +27,7 @@ namespace gdcm
|
|
||||||
* TMaxLength is only a hint. Noone actually respect the max length
|
|
||||||
* TPadChar is the string padding (0 or space)
|
|
||||||
*/
|
|
||||||
-template <char TDelimiter = '\\', unsigned int TMaxLength = 64, char TPadChar = ' '>
|
|
||||||
+template <signed char TDelimiter = '\\', unsigned int TMaxLength = 64, signed char TPadChar = ' '>
|
|
||||||
class /*GDCM_EXPORT*/ String : public std::string /* PLEASE do not export me */
|
|
||||||
{
|
|
||||||
// UI wants \0 for pad character, while ASCII ones wants space char... do not allow anything else
|
|
Loading…
Reference in new issue