bug 797863 - fixes for minor build problems in graphite2 v1.2. r=jdaggett
authorJonathan Kew <jkew@mozilla.com>
Tue, 09 Oct 2012 10:33:22 +0100
changeset 109735 9b66a534561415693e46d5afbb38ecef2c25d6cd
parent 109734 4ac301ef854956c18a3edfef0eb050787ee08e1a
child 109736 84e4bf4bcb876c66dc70243b169a686ac30bb770
push id23652
push userryanvm@gmail.com
push dateWed, 10 Oct 2012 01:10:20 +0000
treeherdermozilla-central@5cca0408a73f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdaggett
bugs797863
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 797863 - fixes for minor build problems in graphite2 v1.2. r=jdaggett
gfx/graphite2/src/Code.cpp
gfx/graphite2/src/FileFace.cpp
--- a/gfx/graphite2/src/Code.cpp
+++ b/gfx/graphite2/src/Code.cpp
@@ -164,26 +164,27 @@ Machine::Code::Code(bool is_constraint, 
         failure(alloc_failed);
         return;
     }
     
     const decoder::limits lims = {
         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);
     if(!dec.load(bytecode_begin, bytecode_end))
        return;
     
     // Is this an empty program?
     if (_instr_count == 0)
--- a/gfx/graphite2/src/FileFace.cpp
+++ b/gfx/graphite2/src/FileFace.cpp
@@ -30,19 +30,19 @@ of the License or (at your option) any l
 //#include "inc/Endian.h"
 #include "inc/FileFace.h"
 //#include "inc/GlyphFace.h"
 //#include "inc/SegCacheStore.h"
 //#include "inc/Segment.h"
 //#include "inc/NameTable.h"
 
 
-using namespace graphite2;
+#ifndef GRAPHITE2_NFILEFACE
 
-#ifndef GRAPHITE2_NFILEFACE
+using namespace graphite2;
 
 FileFace::FileFace(const char *filename)
 : _file(fopen(filename, "rb")),
   _file_len(0),
   _header_tbl(NULL),
   _table_dir(NULL)
 {
     if (!_file) return;