bug 527276 - part 1a - patches to OTS source to resolve build issues. r=roc a=blocking2.0
authorJonathan Kew <jfkthame@gmail.com>
Thu, 07 Oct 2010 08:59:18 +0100
changeset 55081 88ff5f0a9681a0d87d684a563c3a5ea375b87699
parent 55080 6d49509b28a42a6c71be97963db37adc7b94ddc9
child 55082 b45ce9db9d727eeb732a5ccd6dc7029656cbfa75
push id16125
push userjkew@mozilla.com
push dateThu, 07 Oct 2010 08:06:01 +0000
treeherdermozilla-central@2fa4872fffeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, blocking2
bugs527276
milestone2.0b8pre
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 527276 - part 1a - patches to OTS source to resolve build issues. r=roc a=blocking2.0
gfx/ots/include/opentype-sanitiser.h
gfx/ots/src/cff.cc
gfx/ots/src/cff_type2_charstring.h
--- a/gfx/ots/include/opentype-sanitiser.h
+++ b/gfx/ots/include/opentype-sanitiser.h
@@ -10,16 +10,18 @@ typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef short int16_t;
 typedef unsigned short uint16_t;
 typedef int int32_t;
 typedef unsigned int uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #include <Winsock2.h>  // for htons/ntohs
+#undef min
+#undef max
 #else
 #include <arpa/inet.h>
 #include <stdint.h>
 #endif
 
 #include <algorithm>  // for std::min
 #include <cassert>
 #include <cstring>
--- a/gfx/ots/src/cff.cc
+++ b/gfx/ots/src/cff.cc
@@ -14,22 +14,22 @@
 // http://www.microsoft.com/opentype/otspec/cff.htm
 // http://www.microsoft.com/opentype/otspec/5176.CFF.pdf
 
 namespace {
 
 enum DICT_OPERAND_TYPE {
   DICT_OPERAND_INTEGER,
   DICT_OPERAND_REAL,
-  DICT_OPERATOR,
+  DICT_OPERATOR
 };
 
 enum DICT_DATA_TYPE {
   DICT_DATA_TOPLEVEL,
-  DICT_DATA_FDARRAY,
+  DICT_DATA_FDARRAY
 };
 
 // see Appendix. A
 const size_t kNStdString = 390;
 
 bool ReadOffset(ots::Buffer *table, uint8_t off_size, uint32_t *offset) {
   if (off_size > 4) {
     return OTS_FAILURE();
--- a/gfx/ots/src/cff_type2_charstring.h
+++ b/gfx/ots/src/cff_type2_charstring.h
@@ -85,16 +85,16 @@ enum Type2CharStringOperator {
   kSqrt = (12 << 8) + 26,
   kDup = (12 << 8) + 27,
   kExch = (12 << 8) + 28,
   kIndex = (12 << 8) + 29,
   kRoll = (12 << 8) + 30,
   kHFlex = (12 << 8) + 34,
   kFlex = (12 << 8) + 35,
   kHFlex1 = (12 << 8) + 36,
-  kFlex1 = (12 << 8) + 37,
+  kFlex1 = (12 << 8) + 37
   // Operators that are obsoleted or undocumented, such as 'blend', will be
   // rejected.
 };
 
 }  // namespace ots
 
 #endif  // OTS_CFF_TYPE2_CHARSTRING_H_