diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-02-19 22:40:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-19 22:08:39 +0000 |
| commit | 5e8de61a620618120ecf9d48eb258b364e4fa5bc (patch) | |
| tree | 8e49b384c87990b321c3af4409be89d91fea4b05 | |
| parent | 38671c869d8903ba7d0bd516d53ba0ff9d152adf (diff) | |
Disable C4324 structure was padded due to __declspec(align()) warning
Change-Id: I0b4dfe8fe06eb8f7f9fd2929d4efb4f52b25abea
Reviewed-on: https://gerrit.libreoffice.org/14560
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 2c9908b07d44..0aed0f2b4a1c 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -37,12 +37,21 @@ extern "C" { #include <JpegWriter.hxx> #include <boost/scoped_array.hpp> +#ifdef _MSC_VER +#pragma warning(push, 1) /* disable to __declspec(align()) aligned warning */ +#pragma warning (disable: 4324) +#endif + struct ErrorManagerStruct { jpeg_error_mgr pub; jmp_buf setjmp_buffer; }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + extern "C" void errorExit (j_common_ptr cinfo) { ErrorManagerStruct * error = reinterpret_cast<ErrorManagerStruct *>(cinfo->err); |