提交 2eef7173 编写于 作者: B Behdad Esfahbod

[hb-icu-le] Add visbility

上级 d59e28e4
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
#include <hb-blob.h> #include <hb-blob.h>
#include "layout/LETypes.h" #include "layout/LETypes.h"
#include "letest.h"
HB_BEGIN_VISIBILITY
U_NAMESPACE_USE U_NAMESPACE_USE
...@@ -40,5 +43,6 @@ private: ...@@ -40,5 +43,6 @@ private:
le_int32 fTableCacheSize; le_int32 fTableCacheSize;
}; };
#endif HB_END_VISIBILITY
#endif
...@@ -24,45 +24,6 @@ ...@@ -24,45 +24,6 @@
#include <string.h> #include <string.h>
//
// Finds the high bit by binary searching
// through the bits in n.
//
le_int8 PortableFontInstance::highBit(le_int32 value)
{
if (value <= 0) {
return -32;
}
le_uint8 bit = 0;
if (value >= 1 << 16) {
value >>= 16;
bit += 16;
}
if (value >= 1 << 8) {
value >>= 8;
bit += 8;
}
if (value >= 1 << 4) {
value >>= 4;
bit += 4;
}
if (value >= 1 << 2) {
value >>= 2;
bit += 2;
}
if (value >= 1 << 1) {
value >>= 1;
bit += 1;
}
return bit;
}
PortableFontInstance::PortableFontInstance(hb_face_t *face, float xScale, float yScale, LEErrorCode &status) PortableFontInstance::PortableFontInstance(hb_face_t *face, float xScale, float yScale, LEErrorCode &status)
: fFace(face), fXScale(xScale), fYScale(yScale), fUnitsPerEM(0), fAscent(0), fDescent(0), fLeading(0), : fFace(face), fXScale(xScale), fYScale(yScale), fUnitsPerEM(0), fAscent(0), fDescent(0), fLeading(0),
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
#include "layout/LETypes.h" #include "layout/LETypes.h"
#include "layout/LEFontInstance.h" #include "layout/LEFontInstance.h"
#include "letest.h"
#include "FontTableCache.h" #include "FontTableCache.h"
#include "cmaps.h" #include "cmaps.h"
HB_BEGIN_VISIBILITY
class PortableFontInstance : public LEFontInstance, protected FontTableCache class PortableFontInstance : public LEFontInstance, protected FontTableCache
{ {
private: private:
...@@ -51,8 +54,6 @@ private: ...@@ -51,8 +54,6 @@ private:
le_uint16 fNumGlyphs; le_uint16 fNumGlyphs;
le_uint16 fNumLongHorMetrics; le_uint16 fNumLongHorMetrics;
static le_int8 highBit(le_int32 value);
void getMetrics(); void getMetrics();
CMAPMapper *findUnicodeMapper(); CMAPMapper *findUnicodeMapper();
...@@ -109,4 +110,6 @@ public: ...@@ -109,4 +110,6 @@ public:
}; };
HB_END_VISIBILITY
#endif #endif
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
// Finds the high bit by binary searching // Finds the high bit by binary searching
// through the bits in value. // through the bits in value.
// //
le_int8 highBit(le_uint32 value) static inline le_int8 highBit(le_uint32 value)
{ {
le_uint8 bit = 0; le_uint8 bit = 0;
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include "letest.h" #include "letest.h"
#include "sfnt.h" #include "sfnt.h"
HB_BEGIN_VISIBILITY
class CMAPMapper class CMAPMapper
{ {
public: public:
...@@ -80,5 +82,6 @@ inline CMAPMapper::~CMAPMapper() ...@@ -80,5 +82,6 @@ inline CMAPMapper::~CMAPMapper()
{ {
} }
#endif HB_END_VISIBILITY
#endif
...@@ -14,12 +14,24 @@ ...@@ -14,12 +14,24 @@
#ifndef __LETEST_H #ifndef __LETEST_H
#define __LETEST_H #define __LETEST_H
#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
# define HB_BEGIN_VISIBILITY _Pragma ("GCC visibility push(hidden)")
# define HB_END_VISIBILITY _Pragma ("GCC visibility pop")
#else
# define HB_BEGIN_VISIBILITY
# define HB_END_VISIBILITY
#endif
#include "layout/LETypes.h" #include "layout/LETypes.h"
/*#include "unicode/ctest.h"*/ /*#include "unicode/ctest.h"*/
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
HB_BEGIN_VISIBILITY
U_NAMESPACE_USE U_NAMESPACE_USE
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) #define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
...@@ -46,4 +58,6 @@ typedef struct TestResult TestResult; ...@@ -46,4 +58,6 @@ typedef struct TestResult TestResult;
//U_CFUNC void addCTests(TestNode **root); //U_CFUNC void addCTests(TestNode **root);
HB_END_VISIBILITY
#endif #endif
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
#define __SFNT_H #define __SFNT_H
#include "layout/LETypes.h" #include "layout/LETypes.h"
#include "letest.h"
HB_BEGIN_VISIBILITY
U_NAMESPACE_USE U_NAMESPACE_USE
...@@ -445,5 +448,6 @@ struct NAMETable ...@@ -445,5 +448,6 @@ struct NAMETable
typedef struct NAMETable NAMETable; typedef struct NAMETable NAMETable;
#endif #endif
#endif HB_END_VISIBILITY
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册