diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-05 13:09:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-05 17:06:00 +0100 |
| commit | c2374d702b0e4b7a1828964faa528344a5a9ee17 (patch) | |
| tree | e2a8453d55e22de884a1dcd4f621c18f55810639 /include/vcl/BitmapTools.hxx | |
| parent | 1575b46276a44fe0566fec8910188a781589dd75 (diff) | |
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@redhat.com>
Diffstat (limited to 'include/vcl/BitmapTools.hxx')
| -rw-r--r-- | include/vcl/BitmapTools.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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. |