diff --git a/ChangeLog b/ChangeLog index 9dbab8e47..9e9297b02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-14 Werner Lemberg . + + * src/smooth/ftgrays.c One final pragma to silence 64-bit MSVC. + 2013-06-06 Dave Arnold Werner Lemberg diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index d2158e77e..7532a3582 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -358,6 +358,14 @@ typedef ptrdiff_t FT_PtrDist; } TCell; +#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ + /* We disable the warning `structure was padded due to */ + /* __declspec(align())' in order to compile cleanly with */ + /* the maximum level of warnings. */ +#pragma warning( push ) +#pragma warning( disable : 4324 ) +#endif /* _MSC_VER */ + typedef struct gray_TWorker_ { TCoord ex, ey; @@ -405,6 +413,10 @@ typedef ptrdiff_t FT_PtrDist; } gray_TWorker, *gray_PWorker; +#if defined( _MSC_VER ) +#pragma warning( pop ) +#endif + #ifndef FT_STATIC_RASTER #define ras (*worker)