walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix build attempt ^2

This commit is contained in:
Michiharu Ariza 2018-08-15 13:04:43 -07:00
parent eab07e713a
commit c234839f25
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-cff-interp-common-private.hh
View File

@ -26,6 +26,8 @@
#ifndef HB_CFF_INTERP_COMMON_PRIVATE_HH #ifndef HB_CFF_INTERP_COMMON_PRIVATE_HH
#define HB_CFF_INTERP_COMMON_PRIVATE_HH #define HB_CFF_INTERP_COMMON_PRIVATE_HH
#include "hb-common.h"
namespace CFF { namespace CFF {
using namespace OT; using namespace OT;

6
src/hb-cff-interp-cs-common-private.hh
View File

@ -23,8 +23,8 @@
* *
* Adobe Author(s): Michiharu Ariza * Adobe Author(s): Michiharu Ariza
*/ */
#ifndef HB_CFF_CS_INTERP_COMMON_PRIVATE_HH #ifndef HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
#define HB_CFF_CS_INTERP_COMMON_PRIVATE_HH #define HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
#include "hb-cff-interp-common-private.hh" #include "hb-cff-interp-common-private.hh"
@ -171,4 +171,4 @@ struct CSInterpreter : Interpreter<ENV>
} /* namespace CFF */ } /* namespace CFF */
#endif /* HB_CFF_CS_INTERP_COMMON_PRIVATE_HH */ #endif /* HB_CFF_INTERP_CS_COMMON_PRIVATE_HH */

6
src/hb-cff-interp-cs.hh
View File

@ -23,8 +23,8 @@
* *
* Adobe Author(s): Michiharu Ariza * Adobe Author(s): Michiharu Ariza
*/ */
#ifndef HB_CFF_CS_INTERP_HH #ifndef HB_CFF_INTERP_CS_HH
#define HB_CFF_CS_INTERP_HH #define HB_CFF_INTERP_CS_HH
#include "hb-cff-interp-cs.hh" #include "hb-cff-interp-cs.hh"
@ -279,4 +279,4 @@ struct CFFCSInterpreter : CSInterpreter<CFFCSInterpEnv, OPSET, PARAM> {};
} /* namespace CFF */ } /* namespace CFF */
#endif /* HB_CFF_CS_INTERP_HH */ #endif /* HB_CFF_INTERP_CS_HH */

6
src/hb-cff-interp-dict-common-private.hh
View File

@ -23,8 +23,8 @@
* *
* Adobe Author(s): Michiharu Ariza * Adobe Author(s): Michiharu Ariza
*/ */
#ifndef HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH #ifndef HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
#define HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH #define HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
#include "hb-cff-interp-common-private.hh" #include "hb-cff-interp-common-private.hh"
@ -180,4 +180,4 @@ struct DictInterpreter : Interpreter<InterpEnv>
} /* namespace CFF */ } /* namespace CFF */
#endif /* HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH */ #endif /* HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH */

6
src/hb-subset-cff.cc
View File

@ -34,9 +34,6 @@
using namespace CFF; using namespace CFF;
char RETURN_OP[1] = { OpCode_return };
static const ByteStr NULL_SUBR = { RETURN_OP/* str */, 1/* len */ };
struct CFFSubTableOffsets { struct CFFSubTableOffsets {
inline CFFSubTableOffsets (void) inline CFFSubTableOffsets (void)
{ {
@ -384,6 +381,9 @@ static inline bool _write_cff (const cff_subset_plan &plan,
{ {
hb_serialize_context_t c (dest, dest_sz); hb_serialize_context_t c (dest, dest_sz);
char RETURN_OP[1] = { OpCode_return };
const ByteStr NULL_SUBR = { RETURN_OP/* str */, 1/* len */ };
OT::cff *cff = c.start_serialize<OT::cff> (); OT::cff *cff = c.start_serialize<OT::cff> ();
if (unlikely (!c.extend_min (*cff))) if (unlikely (!c.extend_min (*cff)))
return false; return false;