[Libreoffice-commits] core.git: include/vcl vcl/headless vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 5 16:06:26 UTC 2018
include/vcl/BitmapTools.hxx | 6 +--
vcl/headless/svpgdi.cxx | 9 ++---
vcl/source/bitmap/BitmapTools.cxx | 59 +++++++++++++++-----------------------
3 files changed, 31 insertions(+), 43 deletions(-)
New commits:
commit c2374d702b0e4b7a1828964faa528344a5a9ee17
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 5 13:09:46 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Dec 5 17:06:00 2018 +0100
Revert "Compute (un-)premultiply_table at compile time"
This reverts commit 644188bf7f3a07222f2b58a3794348197fb8ad24. It has been found
to cause compilation failure ("vcl/source/bitmap/BitmapTools.cxx(1078): error
C2131: expression did not evaluate to a constant") with Visual Studio 2017
version 15.9, as discussed in the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-December/081500.html>
"Windows build failure - C2131: expression did not evaluate to a constant" (and
Mike thankfully filed a bug upstream,
<https://developercommunity.visualstudio.com/content/problem/398218/
c2131-error-with-stdarray-and-stdmake-integer-sequ.html>). Also, Jenkins node
tb39 which runs the "Gerrit Windows" sub-job of Jenkins' "Gerrit for master"
job apparently has such a Visual Studio 2017 version 15.9 installed, so keeps
failing that job.
Change-Id: I87d25863f2e07474fbb2df3c8f72cd2bcc89582e
Reviewed-on: https://gerrit.libreoffice.org/64618
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index c952498c5c58..ff431783ad24 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -28,10 +28,10 @@ namespace com { namespace sun { namespace star { namespace geometry { struct Int
namespace vcl {
namespace bitmap {
-typedef std::array<std::array<sal_uInt8, 256>, 256> lookup_table;
+typedef sal_uInt8 (*lookup_table)[256];
-VCL_DLLPUBLIC lookup_table const & get_premultiply_table();
-VCL_DLLPUBLIC lookup_table const & get_unpremultiply_table();
+lookup_table VCL_DLLPUBLIC get_premultiply_table();
+lookup_table VCL_DLLPUBLIC get_unpremultiply_table();
/**
* Intended to be used to feed into CreateFromData to create a BitmapEx. RGB data format.
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0a428545f8b3..0b4bd8d377ea 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1654,7 +1654,7 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
}
sal_Int32 nStride;
unsigned char *mask_data = aSurface.getBits(nStride);
- vcl::bitmap::lookup_table const & unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
+ vcl::bitmap::lookup_table unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
for (long y = rTR.mnSrcY ; y < rTR.mnSrcY + rTR.mnSrcHeight; ++y)
{
unsigned char *row = mask_data + (nStride*y);
@@ -1762,7 +1762,7 @@ Color SvpSalGraphics::getPixel( long nX, long nY )
cairo_destroy(cr);
cairo_surface_flush(target);
- vcl::bitmap::lookup_table const & unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
+ vcl::bitmap::lookup_table unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
unsigned char *data = cairo_image_surface_get_data(target);
sal_uInt8 a = data[SVP_CAIRO_ALPHA];
sal_uInt8 b = unpremultiply_table[a][data[SVP_CAIRO_BLUE]];
@@ -2096,9 +2096,8 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, cons
sal_Int32 nUnscaledExtentsRight = nExtentsRight * m_fScale;
sal_Int32 nUnscaledExtentsTop = nExtentsTop * m_fScale;
sal_Int32 nUnscaledExtentsBottom = nExtentsBottom * m_fScale;
- vcl::bitmap::lookup_table const & unpremultiply_table
- = vcl::bitmap::get_unpremultiply_table();
- vcl::bitmap::lookup_table const & premultiply_table = vcl::bitmap::get_premultiply_table();
+ vcl::bitmap::lookup_table unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
+ vcl::bitmap::lookup_table premultiply_table = vcl::bitmap::get_premultiply_table();
for (sal_Int32 y = nUnscaledExtentsTop; y < nUnscaledExtentsBottom; ++y)
{
unsigned char *true_row = target_surface_data + (nStride*y);
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index f9095a86f541..4bac9745795e 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -8,11 +8,6 @@
*
*/
-#include <sal/config.h>
-
-#include <array>
-#include <utility>
-
#include <vcl/BitmapTools.hxx>
#include <sal/log.hxx>
@@ -273,7 +268,7 @@ BitmapEx* CreateFromCairoSurface(Size aSize, cairo_surface_t * pSurface)
cairo_surface_flush(pPixels);
unsigned char *pSrc = cairo_image_surface_get_data( pPixels );
unsigned int nStride = cairo_image_surface_get_stride( pPixels );
- vcl::bitmap::lookup_table const & unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
+ vcl::bitmap::lookup_table unpremultiply_table = vcl::bitmap::get_unpremultiply_table();
for( unsigned long y = 0; y < static_cast<unsigned long>(aSize.Height()); y++ )
{
sal_uInt32 *pPix = reinterpret_cast<sal_uInt32 *>(pSrc + nStride * y);
@@ -732,7 +727,7 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un
::Color aColor;
unsigned int nAlpha = 255;
- vcl::bitmap::lookup_table const & premultiply_table = vcl::bitmap::get_premultiply_table();
+ vcl::bitmap::lookup_table premultiply_table = vcl::bitmap::get_premultiply_table();
for( nY = 0; nY < nHeight; nY++ )
{
::Scanline pReadScan;
@@ -1051,51 +1046,45 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un
return bRet;
}
- static constexpr sal_uInt8 unpremultiply(sal_uInt8 c, sal_uInt8 a)
+ static sal_uInt8 unpremultiply(sal_uInt8 c, sal_uInt8 a)
{
return (a == 0) ? 0 : (c * 255 + a / 2) / a;
}
- static constexpr sal_uInt8 premultiply(sal_uInt8 c, sal_uInt8 a)
+ static sal_uInt8 premultiply(sal_uInt8 c, sal_uInt8 a)
{
return (c * a + 127) / 255;
}
- template<int... Is> static constexpr std::array<sal_uInt8, 256> make_unpremultiply_table_row_(
- int a, std::integer_sequence<int, Is...>)
+ lookup_table get_unpremultiply_table()
{
- return {unpremultiply(Is, a)...};
- }
+ static bool inited;
+ static sal_uInt8 unpremultiply_table[256][256];
- template<int... Is> static constexpr lookup_table make_unpremultiply_table_(
- std::integer_sequence<int, Is...>)
- {
- return {make_unpremultiply_table_row_(Is, std::make_integer_sequence<int, 256>{})...};
- }
+ if (!inited)
+ {
+ for (int a = 0; a < 256; ++a)
+ for (int c = 0; c < 256; ++c)
+ unpremultiply_table[a][c] = unpremultiply(c, a);
+ inited = true;
+ }
- lookup_table const & get_unpremultiply_table()
- {
- static constexpr auto unpremultiply_table = make_unpremultiply_table_(
- std::make_integer_sequence<int, 256>{});
return unpremultiply_table;
}
- template<int... Is> static constexpr std::array<sal_uInt8, 256> make_premultiply_table_row_(
- int a, std::integer_sequence<int, Is...>)
+ lookup_table get_premultiply_table()
{
- return {premultiply(Is, a)...};
- }
+ static bool inited;
+ static sal_uInt8 premultiply_table[256][256];
- template<int... Is> static constexpr lookup_table make_premultiply_table_(
- std::integer_sequence<int, Is...>)
- {
- return {make_premultiply_table_row_(Is, std::make_integer_sequence<int, 256>{})...};
- }
+ if (!inited)
+ {
+ for (int a = 0; a < 256; ++a)
+ for (int c = 0; c < 256; ++c)
+ premultiply_table[a][c] = premultiply(c, a);
+ inited = true;
+ }
- lookup_table const & get_premultiply_table()
- {
- static constexpr auto premultiply_table = make_premultiply_table_(
- std::make_integer_sequence<int, 256>{});
return premultiply_table;
}
More information about the Libreoffice-commits
mailing list