AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial revert of https://skia-review.googlesource.com/c/skia/+/90026 for android

Browse Source 
Some errors:

frameworks/base/core/jni/android/graphics/Bitmap.cpp:385: error: undefined reference to 'gDitherMatrix_4Bit_16'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:397: error: undefined reference to 'gDitherMatrix_4Bit_16'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:373: error: undefined reference to 'gDitherMatrix_3Bit_16'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:322: error: undefined reference to 'SkPM4f::toF16() const'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:333: error: undefined reference to 'SkFloatToHalf(float)'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:334: error: undefined reference to 'SkFloatToHalf(float)'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:335: error: undefined reference to 'SkFloatToHalf(float)'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:336: error: undefined reference to 'SkFloatToHalf(float)'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:639: error: undefined reference to 'SkPM4f::toF16() const'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:494: error: undefined reference to 'SkPM4f::FromF16(unsigned short const*)'
frameworks/base/core/jni/android/graphics/Bitmap.cpp:494: error: undefined reference to 'SkPM4f::unpremul() const'
external/skia/src/core/SkUtils.h:24: error: undefined reference to 'SkOpts::memset32'
frameworks/base/core/jni/android/graphics/NinePatch.cpp:112: error: undefined reference to 'SkLatticeIter::Valid(int, int, SkCanvas::Lattice const&)'
frameworks/base/core/jni/android/graphics/NinePatch.cpp:113: error: undefined reference to 'SkLatticeIter::SkLatticeIter(SkCanvas::Lattice const&, SkRect const&)'
frameworks/base/core/jni/android/graphics/NinePatch.cpp:118: error: undefined reference to 'SkLatticeIter::next(SkRect*, SkRect*, bool*, unsigned int*)'
frameworks/base/core/jni/android/graphics/NinePatch.cpp:118: error: undefined reference to 'SkLatticeIter::next(SkRect*, SkRect*, bool*, unsigned int*)'
frameworks/base/core/jni/android/graphics/NinePatch.cpp:118: error: undefined reference to 'SkLatticeIter::next(SkRect*, SkRect*, bool*, unsigned int*)'
external/skia/src/core/SkGeometry.h:427: error: undefined reference to 'SkConic::computeQuadPOW2(float) const'
external/skia/src/core/SkGeometry.h:430: error: undefined reference to 'SkConic::chopIntoQuadsPOW2(SkPoint*, int) const'
frameworks/base/core/jni/android/graphics/Shader.cpp:77: error: undefined reference to 'SkMakeImageFromRasterBitmap(SkBitmap const&, SkCopyPixelsMode)'

Bug: skia:7454
Change-Id: I49b7c0890ac38b576b39e1ce76b22e2420c99889
Reviewed-on: https://skia-review.googlesource.com/90524
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2018-01-03 10:11:57 -05:00 committed by Skia Commit-Bot
parent 7c9c9e4239
commit b9bfb7b275
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkDither.h
View File

@ -183,8 +183,8 @@ static inline SkPMColor16 SkDitherARGB32To4444(SkPMColor c, unsigned dither)
#define DITHER_VALUE(x) dither_scan[(x) & 3] #define DITHER_VALUE(x) dither_scan[(x) & 3]
#else #else
extern const uint16_t gDitherMatrix_4Bit_16[4]; extern SK_API const uint16_t gDitherMatrix_4Bit_16[4];
extern const uint16_t gDitherMatrix_3Bit_16[4]; extern SK_API const uint16_t gDitherMatrix_3Bit_16[4];
#define DITHER_4444_SCAN(y) const uint16_t dither_scan = gDitherMatrix_4Bit_16[(y) & 3] #define DITHER_4444_SCAN(y) const uint16_t dither_scan = gDitherMatrix_4Bit_16[(y) & 3]
#define DITHER_565_SCAN(y) const uint16_t dither_scan = gDitherMatrix_3Bit_16[(y) & 3] #define DITHER_565_SCAN(y) const uint16_t dither_scan = gDitherMatrix_3Bit_16[(y) & 3]

6
src/core/SkGeometry.h
View File

@ -89,7 +89,7 @@ int SkChopQuadAtMaxCurvature(const SkPoint src[3], SkPoint dst[5]);
convert it into the cubic fitting the same curve. The new cubic convert it into the cubic fitting the same curve. The new cubic
curve is returned in dst[0..3]. curve is returned in dst[0..3].
*/ */
void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]); SK_API void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]);
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -272,13 +272,13 @@ struct SkConic {
* return the power-of-2 number of quads needed to approximate this conic * return the power-of-2 number of quads needed to approximate this conic
* with a sequence of quads. Will be >= 0. * with a sequence of quads. Will be >= 0.
*/ */
int computeQuadPOW2(SkScalar tol) const; int SK_API computeQuadPOW2(SkScalar tol) const;
/** /**
* Chop this conic into N quads, stored continguously in pts[], where * Chop this conic into N quads, stored continguously in pts[], where
* N = 1 << pow2. The amount of storage needed is (1 + 2 * N) * N = 1 << pow2. The amount of storage needed is (1 + 2 * N)
*/ */
int SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const; int SK_API SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
bool findXExtrema(SkScalar* t) const; bool findXExtrema(SkScalar* t) const;
bool findYExtrema(SkScalar* t) const; bool findYExtrema(SkScalar* t) const;

2
src/core/SkHalf.h
View File

@ -23,7 +23,7 @@ static constexpr uint16_t SK_Half1 = 0x3C00; // 1
// convert between half and single precision floating point // convert between half and single precision floating point
float SkHalfToFloat(SkHalf h); float SkHalfToFloat(SkHalf h);
SkHalf SkFloatToHalf(float f); SkHalf SK_API SkFloatToHalf(float f);
// Convert between half and single precision floating point, // Convert between half and single precision floating point,
// assuming inputs and outputs are both finite, and may // assuming inputs and outputs are both finite, and may

2
src/core/SkImagePriv.h
View File

@ -43,7 +43,7 @@ sk_sp<SkShader> SkMakeBitmapShader(const SkBitmap& src, SkShader::TileMode, SkSh
* SkImageInfo, or the bitmap's pixels cannot be accessed, this will return * SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
* nullptr. * nullptr.
*/ */
extern sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap&, SkCopyPixelsMode); extern SK_API sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap&, SkCopyPixelsMode);
/** /**
* Similar to SkMakeImageFromRasterBitmap, this wraps a |src| bitmap in an image. * Similar to SkMakeImageFromRasterBitmap, this wraps a |src| bitmap in an image.

2
src/core/SkLatticeIter.h
View File

@ -18,7 +18,7 @@ struct SkRect;
/** /**
* Disect a lattice request into an sequence of src-rect / dst-rect pairs * Disect a lattice request into an sequence of src-rect / dst-rect pairs
*/ */
class SkLatticeIter { class SK_API SkLatticeIter {
public: public:
static bool Valid(int imageWidth, int imageHeight, const SkCanvas::Lattice& lattice); static bool Valid(int imageWidth, int imageHeight, const SkCanvas::Lattice& lattice);

2
src/core/SkOpts.h
View File

@ -46,7 +46,7 @@ namespace SkOpts {
inverted_CMYK_to_BGR1; // i.e. convert color space inverted_CMYK_to_BGR1; // i.e. convert color space
extern void (*memset16)(uint16_t[], uint16_t, int); extern void (*memset16)(uint16_t[], uint16_t, int);
extern void (*memset32)(uint32_t[], uint32_t, int); extern void SK_API (*memset32)(uint32_t[], uint32_t, int);
extern void (*memset64)(uint64_t[], uint64_t, int); extern void (*memset64)(uint64_t[], uint64_t, int);
// The fastest high quality 32-bit hash we can provide on this platform. // The fastest high quality 32-bit hash we can provide on this platform.

2
src/core/SkPM4f.h
View File

@ -26,7 +26,7 @@ static inline Sk4f swizzle_rb_if_bgra(const Sk4f& x) {
/* /*
* The float values are 0...1 premultiplied in RGBA order (regardless of SkPMColor order) * The float values are 0...1 premultiplied in RGBA order (regardless of SkPMColor order)
*/ */
struct SkPM4f { struct SK_API SkPM4f {
enum { enum {
R, G, B, A, R, G, B, A,
}; };