vcl/inc/skia/gdiimpl.hxx | 3 ++-
vcl/inc/skia/salbmp.hxx | 4 ++--
vcl/skia/salbmp.cxx | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 56756f422788cf345c15359899bf4d6b0acd6a2e
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Nov 19 14:54:22 2019 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Nov 19 14:54:59 2019 +0100
avoid some compiler warnings in Skia VCL code
Change-Id: I3d69697143f690211cdd26d1b9a4c0efe9397197
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 0036b2d89f7a..517bad0db5c8 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -251,7 +251,8 @@ protected:
friend inline std::basic_ostream<charT, traits>&
operator<<(std::basic_ostream<charT, traits>& stream, const
SkiaSalGraphicsImpl* graphics)
{ // O - offscreen, G - GPU-based, R - raster
- return stream << (void*)graphics << " " << Size(graphics->GetWidth(),
graphics->GetHeight())
+ return stream << static_cast<const void*>(graphics) << " "
+ << Size(graphics->GetWidth(), graphics->GetHeight())
<< (graphics->isOffscreen() ? "O" : "") <<
(graphics->isGPU() ? "G" : "R");
}
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index c5922685c5b7..ed0f374162d6 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -83,8 +83,8 @@ private:
operator<<(std::basic_ostream<charT, traits>& stream, const SkiaSalBitmap*
bitmap)
{ // TODO GPU-based, once it's done
// B - has SkBitmap, A - has alpha SkBitmap, D - has data buffer
- return stream << (void*)bitmap << " " << bitmap->GetSize() << "/" <<
bitmap->mBitCount
- << (!bitmap->mBitmap.drawsNothing() ? "B" : "")
+ return stream << static_cast<const void*>(bitmap) << " " <<
bitmap->GetSize() << "/"
+ << bitmap->mBitCount << (!bitmap->mBitmap.drawsNothing()
? "B" : "")
<< (!bitmap->mAlphaBitmap.drawsNothing() ? "A" : "")
<< (bitmap->mBuffer.get() ? "D" : "");
}
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index c1ff1f13e9e3..49cc038d1243 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -164,7 +164,6 @@ bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp,
sal_uInt16 nNewBitCount)
// TODO copy data
SAL_INFO("vcl.skia", "copy(" << this << "): (" << &src << ")");
abort();
- return true;
}
bool SkiaSalBitmap::Create(const
css::uno::Reference<css::rendering::XBitmapCanvas>& rBitmapCanvas,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
