Bug 1465807 - Update OTS to version 7.0.0. r=jfkthame

--HG--
extra : rebase_source : f1a477fc59a9a91a2fa9e4b33a14de1a59374a17

gfx/ots/README.mozilla

@@ -2,7 +2,7 @@ This is the Sanitiser for OpenType project, from http://code.google.com/p/ots/.
 
 Our reference repository is https://github.com/khaledhosny/ots/.
 
-Current revision: c903692702e888dd9bc3e62a129d01af07320ad8 (6.1.1)
+Current revision: 7c8f3fc9cf8b79edb241d94a4847968a5009e78d (7.0.0)
 
 Upstream files included: LICENSE, src/, include/, tests/*.cc
 

gfx/ots/src/fvar.h

@@ -23,7 +23,7 @@ class OpenTypeFVAR : public Table {
   bool Parse(const uint8_t* data, size_t length);
   bool Serialize(OTSStream* out);
 
-  const uint16_t AxisCount() const { return axisCount; }
+  uint16_t AxisCount() const { return axisCount; }
 
  private:
   uint16_t majorVersion;

gfx/ots/src/gvar.cc

@@ -154,3 +154,5 @@ bool OpenTypeGVAR::Serialize(OTSStream* out) {
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME

gfx/ots/src/hvar.cc

@@ -85,3 +85,5 @@ bool OpenTypeHVAR::Serialize(OTSStream* out) {
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME

gfx/ots/src/mvar.cc

@@ -105,3 +105,5 @@ bool OpenTypeMVAR::Serialize(OTSStream* out) {
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME

gfx/ots/src/stat.h

@@ -47,7 +47,7 @@ class OpenTypeSTAT : public Table {
     uint16_t flags;
     uint16_t valueNameID;
     Fixed    value;
-    static const size_t Length() {
+    static size_t Length() {
       return 3 * sizeof(uint16_t) + sizeof(Fixed);
     }
   };
@@ -59,7 +59,7 @@ class OpenTypeSTAT : public Table {
     Fixed    nominalValue;
     Fixed    rangeMinValue;
     Fixed    rangeMaxValue;
-    static const size_t Length() {
+    static size_t Length() {
       return 3 * sizeof(uint16_t) + 3 * sizeof(Fixed);
     }
   };
@@ -70,7 +70,7 @@ class OpenTypeSTAT : public Table {
     uint16_t valueNameID;
     Fixed    value;
     Fixed    linkedValue;
-    static const size_t Length() {
+    static size_t Length() {
       return 3 * sizeof(uint16_t) + 2 * sizeof(Fixed);
     }
   };
@@ -84,7 +84,7 @@ class OpenTypeSTAT : public Table {
       Fixed    value;
     };
     std::vector<AxisValue> axisValues;
-    const size_t Length() const {
+    size_t Length() const {
       return 3 * sizeof(uint16_t) + axisValues.size() * (sizeof(uint16_t) + sizeof(Fixed));
     }
   };

gfx/ots/src/variations.cc

@@ -246,3 +246,5 @@ bool ParseVariationData(const Font* font, const uint8_t* data, size_t length,
 }
 
 } // namespace ots
+
+#undef TABLE_NAME

gfx/ots/src/vvar.cc

@@ -95,3 +95,5 @@ bool OpenTypeVVAR::Serialize(OTSStream* out) {
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME