diff options
author | Mike Reed <reed@google.com> | 2018-01-03 10:11:57 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-03 15:31:39 +0000 |
commit | b9bfb7b275d11eb6ba90dc2dfa9cfa9f73cc613e (patch) | |
tree | 4100e77ffe61c511fdb04b7461f43b415a5599a2 /src/core/SkDither.h | |
parent | 7c9c9e4239b6e9dfec3469326312e4c9a2c164f9 (diff) |
partial revert of https://skia-review.googlesource.com/c/skia/+/90026 for android
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>
Diffstat (limited to 'src/core/SkDither.h')
-rw-r--r-- | src/core/SkDither.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkDither.h b/src/core/SkDither.h index b73f72e3df..685d11754e 100644 --- a/src/core/SkDither.h +++ b/src/core/SkDither.h @@ -183,8 +183,8 @@ static inline SkPMColor16 SkDitherARGB32To4444(SkPMColor c, unsigned dither) #define DITHER_VALUE(x) dither_scan[(x) & 3] #else - extern const uint16_t gDitherMatrix_4Bit_16[4]; - extern const uint16_t gDitherMatrix_3Bit_16[4]; + extern SK_API const uint16_t gDitherMatrix_4Bit_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_565_SCAN(y) const uint16_t dither_scan = gDitherMatrix_3Bit_16[(y) & 3] |