X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa97a5819628c69bc458be425636160ec8d7933..976962797031f1b86eee1462a20c4f8816df06c5:/include/wx/rawbmp.h?ds=sidebyside

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 627961d149..8a347433b3 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -104,7 +104,7 @@
 template <class Channel,
           size_t Bpp, int R, int G, int B, int A = -1,
           class Pixel = wxUint32>
-          
+
 struct WXDLLEXPORT wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"
@@ -120,7 +120,7 @@ struct WXDLLEXPORT wxPixelFormat
     enum { BitsPerPixel = Bpp };
 
     // size of one pixel in ChannelType units (usually bytes)
-    enum { SizePixel = BitsPerPixel / (8 * sizeof(ChannelType)) };
+    enum { SizePixel = Bpp / (8 * sizeof(Channel)) };
 
     // the channels indices inside the pixel
     enum
@@ -143,20 +143,27 @@ struct WXDLLEXPORT wxPixelFormat
 typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
 
 // the (most common) native bitmap format without alpha support
-typedef wxPixelFormat<unsigned char, 24,
-                      #ifdef __WXMSW__
-                                2, 1, 0
-                      #else // !__WXMSW__
-                                0, 1, 2
-                      #endif // __WXMSW__/!__WXMSW__
-                     > wxNativePixelFormat;
+#if defined(__WXMSW__)
+    // under MSW the RGB components are inversed, they're in BGR order
+    typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXMAC__)
+    // under Mac, first component is unused but still present, hence we use
+    // 32bpp, not 24
+    typedef wxPixelFormat<unsigned char, 32, 1, 2, 3> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 0
+#endif
 
 // the (most common) native format for bitmaps with alpha channel
-typedef wxPixelFormat<unsigned char, 32,
-                      wxNativePixelFormat::RED,
-                      wxNativePixelFormat::GREEN,
-                      wxNativePixelFormat::BLUE,
-                      3> wxAlphaPixelFormat;
+#ifdef wxPIXEL_FORMAT_ALPHA
+    typedef wxPixelFormat<unsigned char, 32,
+                          wxNativePixelFormat::RED,
+                          wxNativePixelFormat::GREEN,
+                          wxNativePixelFormat::BLUE,
+                          wxPIXEL_FORMAT_ALPHA> wxAlphaPixelFormat;
+#endif // wxPIXEL_FORMAT_ALPHA
 
 // we also define the (default/best) pixel format for the given class: this is
 // used as default value for the pixel format in wxPixelIterator template
@@ -189,6 +196,8 @@ public:
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
 
+    wxSize GetSize() const { return wxSize(m_width, m_height); }
+
     // the distance between two rows
     int GetRowStride() const { return m_stride; }
 
@@ -560,10 +569,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
 
         // private: -- see comment in the beginning of the file
 
-            // 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
+            // for efficiency reasons this class should 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
             ChannelType *m_ptr;
         };
 
@@ -578,7 +586,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         wxPixelDataIn(wxBitmap& bmp, const wxRect& rect)
             : m_bmp(bmp), m_pixels(bmp, *this)
         {
-            InitRect(rect.GetPositions(), rect.GetSize());
+            InitRect(rect.GetPosition(), rect.GetSize());
         }
 
         wxPixelDataIn(wxBitmap& bmp, const wxPoint& pt, const wxSize& sz)
@@ -636,7 +644,9 @@ class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 {
 public:
-    typedef wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat> Base;
+    typedef
+        typename wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
+        Base;
 
     wxPixelData(Image& image) : Base(image) { }