Commit 6d05622a authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

one more fix with encoding when reading/writing XMLs

parent dc37ad80
...@@ -2149,7 +2149,7 @@ icvXMLParse( CvFileStorage* fs ) ...@@ -2149,7 +2149,7 @@ icvXMLParse( CvFileStorage* fs )
}*/ }*/
{ {
const char* encoding = cvAttrValue( list, "encoding" ); const char* encoding = cvAttrValue( list, "encoding" );
if( encoding && strcmp( encoding, "ASCII" ) != 0 ) if( encoding && strcmp( encoding, "ASCII" ) != 0 && strcmp( encoding, "UTF-8" ) != 0 )
CV_PARSE_ERROR( "Unsupported encoding" ); CV_PARSE_ERROR( "Unsupported encoding" );
} }
...@@ -2651,7 +2651,7 @@ cvOpenFileStorage( const char* filename, CvMemStorage* dststorage, int flags ) ...@@ -2651,7 +2651,7 @@ cvOpenFileStorage( const char* filename, CvMemStorage* dststorage, int flags )
fs->strstorage = cvCreateChildMemStorage( fs->memstorage ); fs->strstorage = cvCreateChildMemStorage( fs->memstorage );
if( !append || file_size == 0 ) if( !append || file_size == 0 )
{ {
icvPuts( fs, "<?xml version=\"1.0\"?>\n" ); icvPuts( fs, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
icvPuts( fs, "<opencv_storage>\n" ); icvPuts( fs, "<opencv_storage>\n" );
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment