Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

[wxWidgets.git] / include / wx / rawbmp.h

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index b0037d896626422bfd7d22645852b666fd9c3b46..568fd7c667d7cac7ca0a1a8e3f976ea3a8f506a4 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -100,9 +100,11 @@
         - index of the alpha component or -1 if none
         - type which can contain the full pixel value (all channels)
  */
         - index of the alpha component or -1 if none
         - type which can contain the full pixel value (all channels)
  */

-template <typename Channel,
+
+template <class Channel,

           size_t Bpp, int R, int G, int B, int A = -1,
           size_t Bpp, int R, int G, int B, int A = -1,

-          typename Pixel = wxUint32>
+          class Pixel = wxUint32>
+          

 struct WXDLLEXPORT wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"
 struct WXDLLEXPORT wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"


@@ -180,12 +182,21 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
 class WXDLLEXPORT wxPixelDataBase
 {
 public:
 class WXDLLEXPORT wxPixelDataBase
 {
 public:

+    // origin of the rectangular region we represent
+    wxPoint GetOrigin() const { return m_ptOrigin; }
+
+    // width and height of the region we represent

     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }

+
+    // the distance between two rows

     int GetRowStride() const { return m_stride; }
 
 // private: -- see comment in the beginning of the file
 
     int GetRowStride() const { return m_stride; }
 
 // private: -- see comment in the beginning of the file
 

+    // the origin of this image inside the bigger bitmap (usually (0, 0))
+    wxPoint m_ptOrigin;
+

     // the size of the image we address, in pixels
     int m_width,
         m_height;
     // the size of the image we address, in pixels
     int m_width,
         m_height;


@@ -266,7 +277,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             typedef wxImagePixelFormat PixelFormat;
 
             // the type of the pixel components
             typedef wxImagePixelFormat PixelFormat;
 
             // the type of the pixel components

-            typedef typename PixelFormat::ChannelType ChannelType;
+            typedef typename dummyPixelFormat::ChannelType ChannelType;

 
             // the pixel data we're working with
             typedef
 
             // the pixel data we're working with
             typedef


@@ -311,12 +322,13 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             {
                 m_pRGB += PixelFormat::SizePixel;
                 if ( m_pAlpha )
             {
                 m_pRGB += PixelFormat::SizePixel;
                 if ( m_pAlpha )

-                    m_pAlpha += PixelFormat::SizePixel;
+                    ++m_pAlpha;

 
                 return *this;
             }
 
 
                 return *this;
             }
 

-            // postfix (hence less efficient -- don't use unless you must) version
+            // postfix (hence less efficient -- don't use it unless you
+            // absolutely must) version

             Iterator operator++(int)
             {
                 Iterator p(*this);
             Iterator operator++(int)
             {
                 Iterator p(*this);


@@ -384,6 +396,25 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             m_stride = Iterator::SizePixel * m_width;
         }
 
             m_stride = Iterator::SizePixel * m_width;
         }
 

+        // initializes us with the given region of the specified image
+        wxPixelDataIn(ImageType& image,
+                      const wxPoint& pt,
+                      const wxSize& sz) : m_image(image), m_pixels(image)
+        {
+            m_stride = Iterator::SizePixel * m_width;
+
+            InitRect(pt, sz);
+        }
+
+        // initializes us with the given region of the specified image
+        wxPixelDataIn(ImageType& image,
+                      const wxRect& rect) : m_image(image), m_pixels(image)
+        {
+            m_stride = Iterator::SizePixel * m_width;
+
+            InitRect(rect.GetPositions(), rect.GetSize());
+        }
+

         // we evaluate to true only if we could get access to bitmap data
         // successfully
         operator bool() const { return m_pixels.IsOk(); }
         // we evaluate to true only if we could get access to bitmap data
         // successfully
         operator bool() const { return m_pixels.IsOk(); }


@@ -392,6 +423,15 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         Iterator GetPixels() const { return m_pixels; }
 
     private:
         Iterator GetPixels() const { return m_pixels; }
 
     private:

+        void InitRect(const wxPoint& pt, const wxSize& sz)
+        {
+            m_width = sz.x;
+            m_height = sz.y;
+
+            m_ptOrigin = pt;
+            m_pixels.Offset(*this, pt.x, pt.y);
+        }
+

         // the image we're working with
         ImageType& m_image;
 
         // the image we're working with
         ImageType& m_image;
 


@@ -431,21 +471,22 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
                 *this = data.GetPixels();
             }
 
                 *this = data.GetPixels();
             }
 

-            // initializes the iterator to point to the origin of the given pixel
-            // data
+            // initializes the iterator to point to the origin of the given
+            // pixel data

             Iterator(PixelData& data)
             {
                 Reset(data);
             }
 
             Iterator(PixelData& data)
             {
                 Reset(data);
             }
 

-            // initializes the iterator to point to the origin of the given bitmap
+            // initializes the iterator to point to the origin of the given
+            // bitmap

             Iterator(wxBitmap& bmp, PixelData& data)
             {
             Iterator(wxBitmap& bmp, PixelData& data)
             {

-                // using cast here is ugly but it should be safe as GetRawData()
-                // real return type should be consistent with BitsPerPixel (which
-                // is in turn defined by ChannelType) and this is the only thing we
-                // can do without making GetRawData() a template function which is
-                // undesirable
+                // using cast here is ugly but it should be safe as
+                // GetRawData() real return type should be consistent with
+                // BitsPerPixel (which is in turn defined by ChannelType) and
+                // this is the only thing we can do without making GetRawData()
+                // a template function which is undesirable

                 m_ptr = (ChannelType *)
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }
                 m_ptr = (ChannelType *)
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }


@@ -465,7 +506,8 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
                 return *this;
             }
 
                 return *this;
             }
 

-            // postfix (hence less efficient -- don't use unless you must) version
+            // postfix (hence less efficient -- don't use it unless you
+            // absolutely must) version

             Iterator operator++(int)
             {
                 Iterator p(*this);
             Iterator operator++(int)
             {
                 Iterator p(*this);


@@ -520,15 +562,29 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
 
             // NB: for efficiency reasons this class must *not* have any other
             //     fields, otherwise it won't be put into a CPU register (as it
 
             // NB: for efficiency reasons this class must *not* have any other
             //     fields, otherwise it won't be put into a CPU register (as it

-            //     should inside the inner loops) by some compilers, notably gcc
+            //     should inside the inner loops) by some compilers, notably
+            //     gcc

             ChannelType *m_ptr;
         };
 
             ChannelType *m_ptr;
         };
 

-        // ctor associates this pointer with a bitmap and locks the bitmap for raw
-        // access, it will be unlocked only by our dtor and so these objects should
-        // normally be only created on the stack, i.e. have limited life-time
-        wxPixelDataIn(wxBitmap bmp) : m_bmp(bmp), m_pixels(bmp, *this)
+        // ctor associates this pointer with a bitmap and locks the bitmap for
+        // raw access, it will be unlocked only by our dtor and so these
+        // objects should normally be only created on the stack, i.e. have
+        // limited life-time
+        wxPixelDataIn(wxBitmap& bmp) : m_bmp(bmp), m_pixels(bmp, *this)
+        {
+        }
+
+        wxPixelDataIn(wxBitmap& bmp, const wxRect& rect)
+            : m_bmp(bmp), m_pixels(bmp, *this)
+        {
+            InitRect(rect.GetPositions(), rect.GetSize());
+        }
+
+        wxPixelDataIn(wxBitmap& bmp, const wxPoint& pt, const wxSize& sz)
+            : m_bmp(bmp), m_pixels(bmp, *this)

         {
         {

+            InitRect(pt, sz);

         }
 
         // we evaluate to true only if we could get access to bitmap data
         }
 
         // we evaluate to true only if we could get access to bitmap data


@@ -554,20 +610,47 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
 
         // the iterator pointing to the image origin
         Iterator m_pixels;
 
         // the iterator pointing to the image origin
         Iterator m_pixels;

+
+    private:
+        void InitRect(const wxPoint& pt, const wxSize& sz)
+        {
+            m_pixels.Offset(*this, pt.x, pt.y);
+
+            m_ptOrigin = pt;
+            m_width = sz.x;
+            m_height = sz.y;
+        }

     };
 };
 
     };
 };
 

+#ifdef __VISUALC__
+    // typedef-name 'foo' used as synonym for class-name 'bar'
+    // (VC++ gives this warning each time wxPixelData::Base is used but it
+    //  doesn't make any sense here -- what's wrong with using typedef instead
+    //  of class, this is what it is here for!)
+    #pragma warning(disable: 4097)
+#endif // __VISUALC__
+

 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 {
 public:
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 {
 public:

-    wxPixelData(const Image& image)
-        : wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(image)
-        {
-        }
+    typedef
+        typename wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
+        Base;
+
+    wxPixelData(Image& image) : Base(image) { }
+
+    wxPixelData(Image& i, const wxRect& rect) : Base(i, rect) { }
+
+    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
+        : Base(i, pt, sz)
+    {
+    }

 };
 
 };
 

+

 // some "predefined" pixel data classes
 typedef wxPixelData<wxImage> wxImagePixelData;
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 // some "predefined" pixel data classes
 typedef wxPixelData<wxImage> wxImagePixelData;
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;


@@ -596,6 +679,7 @@ struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
 
 #ifdef __VISUALC__
     #pragma warning(default: 4355)
 
 #ifdef __VISUALC__
     #pragma warning(default: 4355)

+    #pragma warning(default: 4097)

 #endif
 
 #endif // _WX_RAWBMP_H_BASE_
 #endif
 
 #endif // _WX_RAWBMP_H_BASE_