From 5e8de61a620618120ecf9d48eb258b364e4fa5bc Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 19 Feb 2015 22:40:52 +0100
Subject: 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>
---
 vcl/source/filter/jpeg/jpegc.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

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);
-- 
cgit v1.2.1