1
=== modified file 'src/util/icu_streambuf.cpp'
2
--- src/util/icu_streambuf.cpp	2012-02-20 18:12:06 +0000
3
+++ src/util/icu_streambuf.cpp	2012-02-28 19:36:18 +0000
4
@@ -100,13 +100,19 @@
5
100
  return conv;
100
  return conv;
6
101
}
101
}
7
102
102
15
103
bool icu_streambuf::is_necessary( char const *charset ) {
103
bool icu_streambuf::is_necessary( char const *cc_charset ) {
16
104
  //
104
  //
17
105
  // Checking for "US-ASCII" explicitly isn't necessary since ICU knows about
105
  // Apparently, ucnv_compareNames() doesn't consider "US-ASCII" an alias for
18
106
  // aliases.
106
  // "ASCII", so check for "US-ASCII" ourselves.
19
107
  //
107
  //
20
108
  return  ucnv_compareNames( charset, "ASCII" )
108
  zstring charset( cc_charset );
21
109
      &&  ucnv_compareNames( charset, "UTF-8" );
109
  ascii::trim_whitespace( charset );
22
110
  ascii::to_upper( charset );
23
111
  if ( charset == "US-ASCII" )
24
112
    cc_charset += 3; // skip "US-"
25
113
26
114
  return  ucnv_compareNames( cc_charset, "ASCII" )
27
115
      &&  ucnv_compareNames( cc_charset, "UTF-8" );
28
110
}
116
}
29
111
117
30
112
bool icu_streambuf::is_supported( char const *charset ) {
118
bool icu_streambuf::is_supported( char const *charset ) {
Reviewer	Date Requested	Status
Matthias Brantner	2012-02-28	Approve on 2012-02-28
Paul J. Lucas		Approve on 2012-02-28
Review via email: mp+95027@code.launchpad.net
1	=== modified file 'src/util/icu_streambuf.cpp'
2	--- src/util/icu_streambuf.cpp 2012-02-20 18:12:06 +0000
3	+++ src/util/icu_streambuf.cpp 2012-02-28 19:36:18 +0000
4	@@ -100,13 +100,19 @@
5	100	return conv;	100	return conv;
6	101	}	101	}
7	102		102
15	103	bool icu_streambuf::is_necessary( char const *charset ) {	103	bool icu_streambuf::is_necessary( char const *cc_charset ) {
16	104	//	104	//
17	105	// Checking for "US-ASCII" explicitly isn't necessary since ICU knows about	105	// Apparently, ucnv_compareNames() doesn't consider "US-ASCII" an alias for
18	106	// aliases.	106	// "ASCII", so check for "US-ASCII" ourselves.
19	107	//	107	//
20	108	return ucnv_compareNames( charset, "ASCII" )	108	zstring charset( cc_charset );
21	109	&& ucnv_compareNames( charset, "UTF-8" );	109	ascii::trim_whitespace( charset );
22			110	ascii::to_upper( charset );
23			111	if ( charset == "US-ASCII" )
24			112	cc_charset += 3; // skip "US-"
25			113
26			114	return ucnv_compareNames( cc_charset, "ASCII" )
27			115	&& ucnv_compareNames( cc_charset, "UTF-8" );
28	110	}	116	}
29	111		117
30	112	bool icu_streambuf::is_supported( char const *charset ) {	118	bool icu_streambuf::is_supported( char const *charset ) {