copy wxImage options when copying the images (replaces patch 780705)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/image.cpp b/src/common/image.cpp
index d9f07d30b224365dcf606b06f0382c54d9ca0d86..1d39aeff5c56782fdf982da1d6e4caa0409a4741 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -219,6 +219,11 @@ wxImage wxImage::Copy() const
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
+    // also copy the image options
+    wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
+    imgData->m_optionNames = M_IMGDATA->m_optionNames;
+    imgData->m_optionValues = M_IMGDATA->m_optionValues;
+
     return image;
 }