Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

replacing expat lib-src include with a shorter copy of the table. this should restore linux builds to normal order.

Browse Source
This commit is contained in:
mchinen 2010-04-26 17:45:48 +00:00
parent cb51df5633
commit 52edf9ffc2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xml/XMLWriter.cpp
View File

@ -34,13 +34,20 @@ the general functionality for creating XML in UTF8 encoding.
#include "XMLWriter.h" #include "XMLWriter.h"
#include "XMLTagHandler.h" #include "XMLTagHandler.h"
#include "../../lib-src/expat/xmltok/xmltok_impl.h" //table for xml encoding compatibility with expat decoding
//see ../../lib-src/expat/xmltok/xmltok_impl.h
//and ../../lib-src/expat/xmltok/ asciitab.h
static int charXMLCompatiblity[] = static int charXMLCompatiblity[] =
{ {
#define BT_COLON BT_NMSTRT
#include "../../lib-src/expat/xmltok/asciitab.h" /* 0x00 */ 0, 0, 0, 0,
#undef BT_COLON /* 0x04 */ 0, 0, 0, 0,
#include "../../lib-src/expat/xmltok/latin1tab.h" /* 0x08 */ 0, 1, 1, 0,
/* 0x0C */ 0, 1, 0, 0,
/* 0x10 */ 0, 0, 0, 0,
/* 0x14 */ 0, 0, 0, 0,
/* 0x18 */ 0, 0, 0, 0,
/* 0x1C */ 0, 0, 0, 0,
}; };
@ -288,9 +295,8 @@ wxString XMLWriter::XMLEsc(const wxString & s)
//see xmltok.c in expat checkCharRefNumber() to see how expat bails on these chars. //see xmltok.c in expat checkCharRefNumber() to see how expat bails on these chars.
//also see lib-src/expat/xmltok/asciitab.h to see which characters are nonxml compatible post decode //also see lib-src/expat/xmltok/asciitab.h to see which characters are nonxml compatible post decode
//(we can still encode '&' and '<' with this table, but it prevents us from encoding eot) //(we can still encode '&' and '<' with this table, but it prevents us from encoding eot)
//the table only goes up to 0x7F, so we don't check higher than this. //everything is compatible past ascii 0x20, so we don't check higher than this.
//this assumes that c as ascii compatible, which utf8 is. if(c> 0x1F || charXMLCompatiblity[c]!=0)
if(c> 0x7F || charXMLCompatiblity[c]!=BT_NONXML)
result += wxString::Format(wxT("&#x%04x;"), c); result += wxString::Format(wxT("&#x%04x;"), c);
} }
else { else {