Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed reading/writing of utf-8 strings

Browse Source
pull/13383/head
Vadim Pisarevsky 14 years ago
parent 1388826c41
commit 856c717783
1 changed files with 19 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      modules/core/src/persistence.cpp

32
modules/core/src/persistence.cpp
Unescape View File

@ -49,8 +49,8 @@
* Common macros and type definitions * * Common macros and type definitions *
\****************************************************************************************/ \****************************************************************************************/
#define cv_isprint(c) ((signed char)(c) >= (signed char)' ') #define cv_isprint(c) ((uchar)(c) >= (uchar)' ')
#define cv_isprint_or_tab(c) ((signed char)(c) >= (signed char)' ' || (c) == '\t') #define cv_isprint_or_tab(c) ((uchar)(c) >= (uchar)' ' || (c) == '\t')
static char* icv_itoa( int _val, char* buffer, int /*radix*/ ) static char* icv_itoa( int _val, char* buffer, int /*radix*/ )
{ {
@ -1905,11 +1905,16 @@ icvXMLParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node,
} }
else if( c == '&' ) else if( c == '&' )
{ {
if( *ptr == '#' ) if( *++ptr == '#' )
{ {
int val; int val, base = 10;
ptr++; ptr++;
val = (int)strtol( ptr, &endptr, 0 ); if( *ptr == 'x' )
{
base = 16;
ptr++;
}
val = (int)strtol( ptr, &endptr, base );
if( (unsigned)val > (unsigned)255 || if( (unsigned)val > (unsigned)255 ||
!endptr || *endptr != ';' ) !endptr || *endptr != ';' )
CV_PARSE_ERROR( "Invalid numeric value in the string" ); CV_PARSE_ERROR( "Invalid numeric value in the string" );
@ -1917,7 +1922,7 @@ icvXMLParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node,
} }
else else
{ {
endptr = ptr++; endptr = ptr;
do c = *++endptr; do c = *++endptr;
while( isalnum(c) ); while( isalnum(c) );
if( c != ';' ) if( c != ';' )
@ -2427,8 +2432,12 @@ icvXMLWriteString( CvFileStorage* fs, const char* key, const char* str, int quot
{ {
char c = str[i]; char c = str[i];
if( !isalnum(c) && (!cv_isprint(c) || c == '<' || c == '>' || if( (uchar)c >= 128 || c == ' ' )
c == '&' || c == '\'' || c == '\"') ) {
*data++ = c;
need_quote = 1;
}
else if( !cv_isprint(c) || c == '<' || c == '>' || c == '&' || c == '\'' || c == '\"' )
{ {
*data++ = '&'; *data++ = '&';
if( c == '<' ) if( c == '<' )
@ -2458,17 +2467,14 @@ icvXMLWriteString( CvFileStorage* fs, const char* key, const char* str, int quot
} }
else else
{ {
sprintf( data, "#x%02x", c ); sprintf( data, "#x%02x", (uchar)c );
data += 4; data += 4;
} }
*data++ = ';'; *data++ = ';';
need_quote = 1;
} }
else else
{
if( c == ' ' )
need_quote = 1;
*data++ = c; *data++ = c;
}
} }
if( !need_quote && (isdigit(str[0]) || if( !need_quote && (isdigit(str[0]) ||
str[0] == '+' || str[0] == '-' || str[0] == '.' )) str[0] == '+' || str[0] == '-' || str[0] == '.' ))

Write Preview
Loading…
Cancel
Save