summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-30 17:47:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-10-02 16:49:29 +0200
commit1f8d73eb9a4b5a3eb62689135e83a6f39eca1bd8 (patch)
tree98c1ef059526d4fab150b0630f594a24d7b8cfc8
parent54a737ab4dafa141c513b7fb61f20f99f968c138 (diff)
-Werror,-Wunused-function
Change-Id: Ib436192fc4fc30a0e6efa1618e5258f545abc36a
-rw-r--r--vcl/source/fontsubset/sft.cxx25
-rw-r--r--vcl/source/fontsubset/ttcr.cxx61
2 files changed, 4 insertions, 82 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index e1dcb76d6c30..4bdc48ec8202 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -235,10 +235,6 @@ _inline void *scalloc(size_t n, size_t size)
return res;
}
-_inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) {
- return (a << 24) | (b << 16) | (c << 8) | d;
-}
-
/*- Data access macros for data stored in big-endian or little-endian format */
_inline sal_Int16 GetInt16(const sal_uInt8 *ptr, size_t offset, int bigendian)
{
@@ -301,20 +297,6 @@ _inline sal_uInt32 GetUInt32(const sal_uInt8 *ptr, size_t offset, int bigendian)
return t;
}
-_inline void PutInt16(sal_Int16 val, sal_uInt8 *ptr, size_t offset, int bigendian)
-{
- assert(ptr != 0);
-
- if (bigendian) {
- ptr[offset] = (sal_uInt8)((val >> 8) & 0xFF);
- ptr[offset+1] = (sal_uInt8)(val & 0xFF);
- } else {
- ptr[offset+1] = (sal_uInt8)((val >> 8) & 0xFF);
- ptr[offset] = (sal_uInt8)(val & 0xFF);
- }
-
-}
-
#if defined(OSL_BIGENDIAN)
#define Int16FromMOTA(a) (a)
#define Int32FromMOTA(a) (a)
@@ -395,13 +377,6 @@ _inline int XUnits(int unitsPerEm, int n)
return (n * 1000) / unitsPerEm;
}
-_inline const char *UnicodeRangeName(sal_uInt16 bit)
-{
- if (bit > LAST_URANGE_BIT) bit = LAST_URANGE_BIT+1;
-
- return ulcodes[bit];
-}
-
_inline const sal_uInt8* getTable( TrueTypeFont *ttf, sal_uInt32 ord)
{
return (sal_uInt8*)ttf->tables[ord];
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 2e069c382745..f92db8caf4e3 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -75,10 +75,6 @@ typedef struct {
#define _inline static
#endif
-_inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) {
- return (a << 24) | (b << 16) | (c << 8) | d;
-}
-
/*- Data access macros for data stored in big-endian or little-endian format */
_inline sal_Int16 GetInt16( const sal_uInt8* ptr, sal_uInt32 offset, int bigendian)
{
@@ -108,40 +104,6 @@ _inline sal_uInt16 GetUInt16( const sal_uInt8* ptr, sal_uInt32 offset, int bigen
return t;
}
-_inline sal_Int32 GetInt32( const sal_uInt8* ptr, sal_uInt32 offset, int bigendian)
-{
- sal_Int32 t;
- assert(ptr != 0);
-
- if (bigendian) {
- t = (ptr+offset)[0] << 24 | (ptr+offset)[1] << 16 |
- (ptr+offset)[2] << 8 | (ptr+offset)[3];
- } else {
- t = (ptr+offset)[3] << 24 | (ptr+offset)[2] << 16 |
- (ptr+offset)[1] << 8 | (ptr+offset)[0];
- }
-
- return t;
-}
-
-_inline sal_uInt32 GetUInt32( const sal_uInt8* ptr, sal_uInt32 offset, int bigendian)
-{
- sal_uInt32 t;
- assert(ptr != 0);
-
-
- if (bigendian) {
- t = (ptr+offset)[0] << 24 | (ptr+offset)[1] << 16 |
- (ptr+offset)[2] << 8 | (ptr+offset)[3];
- } else {
- t = (ptr+offset)[3] << 24 | (ptr+offset)[2] << 16 |
- (ptr+offset)[1] << 8 | (ptr+offset)[0];
- }
-
- return t;
-}
-
-
_inline void PutInt16(sal_Int16 val, sal_uInt8 *ptr, sal_uInt32 offset, int bigendian)
{
assert(ptr != 0);
@@ -186,25 +148,6 @@ _inline void PutUInt32(sal_uInt32 val, sal_uInt8 *ptr, sal_uInt32 offset, int bi
}
-
-_inline void PutInt32(sal_Int32 val, sal_uInt8 *ptr, sal_uInt32 offset, int bigendian)
-{
- assert(ptr != 0);
-
- if (bigendian) {
- ptr[offset] = (sal_uInt8)((val >> 24) & 0xFF);
- ptr[offset+1] = (sal_uInt8)((val >> 16) & 0xFF);
- ptr[offset+2] = (sal_uInt8)((val >> 8) & 0xFF);
- ptr[offset+3] = (sal_uInt8)(val & 0xFF);
- } else {
- ptr[offset+3] = (sal_uInt8)((val >> 24) & 0xFF);
- ptr[offset+2] = (sal_uInt8)((val >> 16) & 0xFF);
- ptr[offset+1] = (sal_uInt8)((val >> 8) & 0xFF);
- ptr[offset] = (sal_uInt8)(val & 0xFF);
- }
-
-}
-
static int TableEntryCompareF(const void *l, const void *r)
{
return ((const TableEntry *) l)->tag - ((const TableEntry *) r)->tag;
@@ -1607,6 +1550,10 @@ extern "C"
#ifdef TEST_TTCR
+_inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) {
+ return (a << 24) | (b << 16) | (c << 8) | d;
+}
+
int main(void)
{
TrueTypeCreator *ttcr;