aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/core/SkEndian.h194
-rw-r--r--include/core/SkPicture.h1
-rw-r--r--include/core/SkScalar.h2
-rw-r--r--include/core/SkTypeface.h2
-rw-r--r--include/private/SkFloatBits.h (renamed from include/core/SkFloatBits.h)0
-rw-r--r--include/private/SkFloatingPoint.h (renamed from include/core/SkFloatingPoint.h)0
-rw-r--r--include/private/SkWeakRefCnt.h (renamed from include/core/SkWeakRefCnt.h)0
-rw-r--r--include/svg/parser/SkSVGParser.h1
8 files changed, 2 insertions, 198 deletions
diff --git a/include/core/SkEndian.h b/include/core/SkEndian.h
deleted file mode 100644
index 0955fcc505..0000000000
--- a/include/core/SkEndian.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkEndian_DEFINED
-#define SkEndian_DEFINED
-
-#include "SkTypes.h"
-
-/** \file SkEndian.h
-
- Macros and helper functions for handling 16 and 32 bit values in
- big and little endian formats.
-*/
-
-#if defined(SK_CPU_LENDIAN) && defined(SK_CPU_BENDIAN)
- #error "can't have both LENDIAN and BENDIAN defined"
-#endif
-
-#if !defined(SK_CPU_LENDIAN) && !defined(SK_CPU_BENDIAN)
- #error "need either LENDIAN or BENDIAN defined"
-#endif
-
-/** Swap the two bytes in the low 16bits of the parameters.
- e.g. 0x1234 -> 0x3412
-*/
-static inline uint16_t SkEndianSwap16(uint16_t value) {
- return static_cast<uint16_t>((value >> 8) | (value << 8));
-}
-
-template<uint16_t N> struct SkTEndianSwap16 {
- static const uint16_t value = static_cast<uint16_t>((N >> 8) | ((N & 0xFF) << 8));
-};
-
-/** Vector version of SkEndianSwap16(), which swaps the
- low two bytes of each value in the array.
-*/
-static inline void SkEndianSwap16s(uint16_t array[], int count) {
- SkASSERT(count == 0 || array != NULL);
-
- while (--count >= 0) {
- *array = SkEndianSwap16(*array);
- array += 1;
- }
-}
-
-/** Reverse all 4 bytes in a 32bit value.
- e.g. 0x12345678 -> 0x78563412
-*/
-static inline uint32_t SkEndianSwap32(uint32_t value) {
- return ((value & 0xFF) << 24) |
- ((value & 0xFF00) << 8) |
- ((value & 0xFF0000) >> 8) |
- (value >> 24);
-}
-
-template<uint32_t N> struct SkTEndianSwap32 {
- static const uint32_t value = ((N & 0xFF) << 24) |
- ((N & 0xFF00) << 8) |
- ((N & 0xFF0000) >> 8) |
- (N >> 24);
-};
-
-/** Vector version of SkEndianSwap32(), which swaps the
- bytes of each value in the array.
-*/
-static inline void SkEndianSwap32s(uint32_t array[], int count) {
- SkASSERT(count == 0 || array != NULL);
-
- while (--count >= 0) {
- *array = SkEndianSwap32(*array);
- array += 1;
- }
-}
-
-/** Reverse all 8 bytes in a 64bit value.
- e.g. 0x1122334455667788 -> 0x8877665544332211
-*/
-static inline uint64_t SkEndianSwap64(uint64_t value) {
- return (((value & 0x00000000000000FFULL) << (8*7)) |
- ((value & 0x000000000000FF00ULL) << (8*5)) |
- ((value & 0x0000000000FF0000ULL) << (8*3)) |
- ((value & 0x00000000FF000000ULL) << (8*1)) |
- ((value & 0x000000FF00000000ULL) >> (8*1)) |
- ((value & 0x0000FF0000000000ULL) >> (8*3)) |
- ((value & 0x00FF000000000000ULL) >> (8*5)) |
- ((value) >> (8*7)));
-}
-template<uint64_t N> struct SkTEndianSwap64 {
- static const uint64_t value = (((N & 0x00000000000000FFULL) << (8*7)) |
- ((N & 0x000000000000FF00ULL) << (8*5)) |
- ((N & 0x0000000000FF0000ULL) << (8*3)) |
- ((N & 0x00000000FF000000ULL) << (8*1)) |
- ((N & 0x000000FF00000000ULL) >> (8*1)) |
- ((N & 0x0000FF0000000000ULL) >> (8*3)) |
- ((N & 0x00FF000000000000ULL) >> (8*5)) |
- ((N) >> (8*7)));
-};
-
-/** Vector version of SkEndianSwap64(), which swaps the
- bytes of each value in the array.
-*/
-static inline void SkEndianSwap64s(uint64_t array[], int count) {
- SkASSERT(count == 0 || array != NULL);
-
- while (--count >= 0) {
- *array = SkEndianSwap64(*array);
- array += 1;
- }
-}
-
-#ifdef SK_CPU_LENDIAN
- #define SkEndian_SwapBE16(n) SkEndianSwap16(n)
- #define SkEndian_SwapBE32(n) SkEndianSwap32(n)
- #define SkEndian_SwapBE64(n) SkEndianSwap64(n)
- #define SkEndian_SwapLE16(n) (n)
- #define SkEndian_SwapLE32(n) (n)
- #define SkEndian_SwapLE64(n) (n)
-
- #define SkTEndian_SwapBE16(n) SkTEndianSwap16<n>::value
- #define SkTEndian_SwapBE32(n) SkTEndianSwap32<n>::value
- #define SkTEndian_SwapBE64(n) SkTEndianSwap64<n>::value
- #define SkTEndian_SwapLE16(n) (n)
- #define SkTEndian_SwapLE32(n) (n)
- #define SkTEndian_SwapLE64(n) (n)
-#else // SK_CPU_BENDIAN
- #define SkEndian_SwapBE16(n) (n)
- #define SkEndian_SwapBE32(n) (n)
- #define SkEndian_SwapBE64(n) (n)
- #define SkEndian_SwapLE16(n) SkEndianSwap16(n)
- #define SkEndian_SwapLE32(n) SkEndianSwap32(n)
- #define SkEndian_SwapLE64(n) SkEndianSwap64(n)
-
- #define SkTEndian_SwapBE16(n) (n)
- #define SkTEndian_SwapBE32(n) (n)
- #define SkTEndian_SwapBE64(n) (n)
- #define SkTEndian_SwapLE16(n) SkTEndianSwap16<n>::value
- #define SkTEndian_SwapLE32(n) SkTEndianSwap32<n>::value
- #define SkTEndian_SwapLE64(n) SkTEndianSwap64<n>::value
-#endif
-
-// When a bytestream is embedded in a 32-bit word, how far we need to
-// shift the word to extract each byte from the low 8 bits by anding with 0xff.
-#ifdef SK_CPU_LENDIAN
- #define SkEndian_Byte0Shift 0
- #define SkEndian_Byte1Shift 8
- #define SkEndian_Byte2Shift 16
- #define SkEndian_Byte3Shift 24
-#else // SK_CPU_BENDIAN
- #define SkEndian_Byte0Shift 24
- #define SkEndian_Byte1Shift 16
- #define SkEndian_Byte2Shift 8
- #define SkEndian_Byte3Shift 0
-#endif
-
-
-#if defined(SK_UINT8_BITFIELD_LENDIAN) && defined(SK_UINT8_BITFIELD_BENDIAN)
- #error "can't have both bitfield LENDIAN and BENDIAN defined"
-#endif
-
-#if !defined(SK_UINT8_BITFIELD_LENDIAN) && !defined(SK_UINT8_BITFIELD_BENDIAN)
- #ifdef SK_CPU_LENDIAN
- #define SK_UINT8_BITFIELD_LENDIAN
- #else
- #define SK_UINT8_BITFIELD_BENDIAN
- #endif
-#endif
-
-#ifdef SK_UINT8_BITFIELD_LENDIAN
- #define SK_UINT8_BITFIELD(f0, f1, f2, f3, f4, f5, f6, f7) \
- SK_OT_BYTE f0 : 1; \
- SK_OT_BYTE f1 : 1; \
- SK_OT_BYTE f2 : 1; \
- SK_OT_BYTE f3 : 1; \
- SK_OT_BYTE f4 : 1; \
- SK_OT_BYTE f5 : 1; \
- SK_OT_BYTE f6 : 1; \
- SK_OT_BYTE f7 : 1;
-#else
- #define SK_UINT8_BITFIELD(f0, f1, f2, f3, f4, f5, f6, f7) \
- SK_OT_BYTE f7 : 1; \
- SK_OT_BYTE f6 : 1; \
- SK_OT_BYTE f5 : 1; \
- SK_OT_BYTE f4 : 1; \
- SK_OT_BYTE f3 : 1; \
- SK_OT_BYTE f2 : 1; \
- SK_OT_BYTE f1 : 1; \
- SK_OT_BYTE f0 : 1;
-#endif
-
-#endif
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 358faf9524..baef45ded0 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -9,7 +9,6 @@
#define SkPicture_DEFINED
#include "SkImageDecoder.h"
-#include "SkLazyPtr.h"
#include "SkRefCnt.h"
#include "SkTypes.h"
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index 25d1c611cd..71575a4920 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -9,7 +9,7 @@
#define SkScalar_DEFINED
#include "SkFixed.h"
-#include "SkFloatingPoint.h"
+#include "../private/SkFloatingPoint.h"
// TODO: move this sort of check into SkPostConfig.h
#define SK_SCALAR_IS_DOUBLE 0
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index a9204a6df9..863b8abac5 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -14,7 +14,7 @@
#include "SkLazyPtr.h"
#include "SkRect.h"
#include "SkString.h"
-#include "SkWeakRefCnt.h"
+#include "../private/SkWeakRefCnt.h"
class SkDescriptor;
class SkFontData;
diff --git a/include/core/SkFloatBits.h b/include/private/SkFloatBits.h
index 3ddb9ef564..3ddb9ef564 100644
--- a/include/core/SkFloatBits.h
+++ b/include/private/SkFloatBits.h
diff --git a/include/core/SkFloatingPoint.h b/include/private/SkFloatingPoint.h
index f7ee816b12..f7ee816b12 100644
--- a/include/core/SkFloatingPoint.h
+++ b/include/private/SkFloatingPoint.h
diff --git a/include/core/SkWeakRefCnt.h b/include/private/SkWeakRefCnt.h
index a550951970..a550951970 100644
--- a/include/core/SkWeakRefCnt.h
+++ b/include/private/SkWeakRefCnt.h
diff --git a/include/svg/parser/SkSVGParser.h b/include/svg/parser/SkSVGParser.h
index c2f9112e64..bb3ab90517 100644
--- a/include/svg/parser/SkSVGParser.h
+++ b/include/svg/parser/SkSVGParser.h
@@ -12,7 +12,6 @@
#include "SkMatrix.h"
#include "SkTDict.h"
-#include "SkTDStack.h"
#include "SkSVGPaintState.h"
#include "SkSVGTypes.h"
#include "SkStream.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 04:01:04 +0000