Moved some warning pragmas around

Author: nickgammon

MUSHclient.dsp

@@ -3060,6 +3060,8 @@ unsigned char header [8];
     return eUnableToLoadImage;
     }
 
+#pragma warning (push)
+#pragma warning (disable : 4611)  // interaction between '_setjmp' and C++ object destruction is non-portable
 
   // if png fails it will longjmp back to here, so we destroy the structure,
   // close the file, and wrap up
@@ -3071,6 +3073,7 @@ unsigned char header [8];
     return eUnableToLoadImage;
     }
 
+#pragma warning (pop)
 
   // initialize IO
   png_init_io (png_ptr, fp);
@@ -3204,6 +3207,8 @@ long LoadPngMemory (unsigned char * Buffer, const size_t Length, HBITMAP & hbmp,
     return eUnableToLoadImage;
     }
 
+#pragma warning (push)
+#pragma warning (disable : 4611)  // interaction between '_setjmp' and C++ object destruction is non-portable
 
   // if png fails it will longjmp back to here, so we destroy the structure,
   // and wrap up
@@ -3214,6 +3219,7 @@ long LoadPngMemory (unsigned char * Buffer, const size_t Length, HBITMAP & hbmp,
     return eUnableToLoadImage;
     }
 
+#pragma warning (pop)
 
   tPngBufferInfo PngBufferInfo;
   PngBufferInfo.BufferPos = Buffer;

Utilities.cpp

@@ -1264,6 +1264,9 @@ long CMiniWindow::WritePng (LPCTSTR FileName, const BITMAPINFO * bmi, unsigned c
     }
 
 
+#pragma warning (push)
+#pragma warning (disable : 4611)  // interaction between '_setjmp' and C++ object destruction is non-portable
+
   // if png fails it will longjmp back to here, so we destroy the structure,
   // close the file, and wrap up
   if (setjmp(png_jmpbuf(png_ptr)))
@@ -1273,6 +1276,8 @@ long CMiniWindow::WritePng (LPCTSTR FileName, const BITMAPINFO * bmi, unsigned c
     return eLogFileBadWrite;
     }
 
+#pragma warning (pop)
+
   // initialize IO
   png_init_io (png_ptr, fp);
 

miniwindow.cpp

@@ -16,7 +16,6 @@
 #pragma warning (disable : 4511)  // copy constructor could not be generated
 #pragma warning (disable : 4512)  // assignment operator could not be generated
 #pragma warning (disable : 4514)  // unreferenced inline function has been removed
-#pragma warning (disable : 4611)  // interaction between '_setjmp' and C++ object destruction is non-portable
 #pragma warning (disable : 4663)  // C++ language change: to explicitly specialize class template yadda yadda
 #pragma warning (disable : 4702)  // unreachable code
 #pragma warning (disable : 4706)  // assignment within conditional expression