bug 797863 - fixes for minor build problems in graphite2 v1.2. r=jdaggett

This commit is contained in:
Jonathan Kew 2012-10-09 10:33:22 +01:00
parent 9ee73bf342
commit 5a533bba08
2 changed files with 7 additions and 6 deletions

View File

@ -169,16 +169,17 @@ Machine::Code::Code(bool is_constraint, const byte * bytecode_begin, const byte
bytecode_end,
pre_context,
rule_length,
silf.numClasses(),
face.glyphs().numAttrs(),
face.numFeatures(),
static_cast<uint16>(silf.numClasses()),
static_cast<uint16>(face.glyphs().numAttrs()),
static_cast<byte>(face.numFeatures()),
{1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,255,
1,1,1,1,1,1,1,1,
1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0, silf.numUser()}
0,0,0,0,0,0,0,
static_cast<byte>(silf.numUser())}
};
decoder dec(lims, *this);

View File

@ -35,10 +35,10 @@ of the License or (at your option) any later version.
//#include "inc/NameTable.h"
using namespace graphite2;
#ifndef GRAPHITE2_NFILEFACE
using namespace graphite2;
FileFace::FileFace(const char *filename)
: _file(fopen(filename, "rb")),
_file_len(0),