summaryrefslogtreecommitdiffstats
path: root/external/skia
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-06-27 15:15:41 +0200
committerLuboš Luňák <l.lunak@collabora.com>2020-06-30 08:03:46 +0200
commit0059392fc723deb53350878f7b92474ba2d49870 (patch)
tree82327f4d9e306de80d05aa77889585faabf96a72 /external/skia
parentdifferentiate between 8bit and any-bit grey palette (tdf#121120) (diff)
downloadcore-0059392fc723deb53350878f7b92474ba2d49870.tar.gz
core-0059392fc723deb53350878f7b92474ba2d49870.zip
direct 8bit gray -> RGBA conversion in SkiaSalBitmap
Change-Id: Ic77f9b8f9244e7fdaca78f91686645eee421d18f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97288 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external/skia')
-rw-r--r--external/skia/extend-rgb-to-rgba.patch.014
1 files changed, 10 insertions, 4 deletions
diff --git a/external/skia/extend-rgb-to-rgba.patch.0 b/external/skia/extend-rgb-to-rgba.patch.0
index f68dbab96336..e0ce55fa2377 100644
--- a/external/skia/extend-rgb-to-rgba.patch.0
+++ b/external/skia/extend-rgb-to-rgba.patch.0
@@ -1,19 +1,21 @@
diff --git a/include/core/SkSwizzle.h b/include/core/SkSwizzle.h
-index 61e93b2da7..c19063bb91 100644
+index 61e93b2da7..9a26f0f492 100644
--- ./include/core/SkSwizzle.h
+++ ./include/core/SkSwizzle.h
-@@ -16,4 +16,6 @@
+@@ -16,4 +16,8 @@
*/
SK_API void SkSwapRB(uint32_t* dest, const uint32_t* src, int count);
+SK_API void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count);
+
++SK_API void SkExtendGrayToRGBA(uint32_t* dest, const uint8_t* src, int count);
++
#endif
diff --git a/src/core/SkSwizzle.cpp b/src/core/SkSwizzle.cpp
-index 301b0184f1..6e6dd27558 100644
+index 301b0184f1..382323695f 100644
--- ./src/core/SkSwizzle.cpp
+++ ./src/core/SkSwizzle.cpp
-@@ -12,3 +12,7 @@
+@@ -12,3 +12,11 @@
void SkSwapRB(uint32_t* dest, const uint32_t* src, int count) {
SkOpts::RGBA_to_BGRA(dest, src, count);
}
@@ -21,3 +23,7 @@ index 301b0184f1..6e6dd27558 100644
+void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count) {
+ SkOpts::RGB_to_RGB1(dest, src, count);
+}
++
++void SkExtendGrayToRGBA(uint32_t* dest, const uint8_t* src, int count) {
++ SkOpts::gray_to_RGB1(dest, src, count);
++}