bracket unused function

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

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index e5d03d0a6dc8804e749d74d5c64aba5b068c83eb..2731869eead8b63de5004da2b52fd119c8797fef 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -5,12 +5,19 @@
 // Modified by:
 // Created:     10.03.03
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     10.03.03
 // RCS-ID:      $Id$

-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_RAWBMP_H_BASE_
-#define _WX_RAWBMP_H_BASE_
+#ifndef _WX_RAWBMP_H_
+#define _WX_RAWBMP_H_
+
+#include "wx/defs.h"
+
+#ifdef wxHAS_RAW_BITMAP
+
+#include "wx/image.h"
+#include "wx/bitmap.h"

 
 // ----------------------------------------------------------------------------
 // Abstract Pixel API
 
 // ----------------------------------------------------------------------------
 // Abstract Pixel API


@@ -69,10 +76,12 @@
     }
  */
 
     }
  */
 

-#ifdef __VISUALC__
-    // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
-    #pragma warning(disable: 4355) // 'this' used in initializer list
-#endif
+/*
+    Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has
+    problems with exporting inner class defined inside a specialization of a
+    template class from a DLL. Besides, as all the methods are inline it's not
+    really necessary to put them in DLL at all.
+ */

 
 // ----------------------------------------------------------------------------
 // wxPixelFormat
 
 // ----------------------------------------------------------------------------
 // wxPixelFormat


@@ -100,10 +109,12 @@
         - 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>
-struct WXDLLEXPORT wxPixelFormat
+          class Pixel = wxUint32>
+
+struct wxPixelFormat

 {
     // iterator over pixels is usually of type "ChannelType *"
     typedef Channel ChannelType;
 {
     // iterator over pixels is usually of type "ChannelType *"
     typedef Channel ChannelType;


@@ -118,7 +129,7 @@ struct WXDLLEXPORT wxPixelFormat
     enum { BitsPerPixel = Bpp };
 
     // size of one pixel in ChannelType units (usually bytes)
     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
 
     // the channels indices inside the pixel
     enum


@@ -141,33 +152,57 @@ 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, 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 reversed, 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
+#elif defined(__WXCOCOA__)
+    // Cocoa is standard RGB or RGBA (normally it is RGBA)
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXGTK__)
+    // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXDFB__)
+    // Under DirectFB, RGB components are reversed, they're in BGR order
+    typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#endif

 
 // the (most common) native format for bitmaps with alpha channel
 
 // 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
 template <class T> struct wxPixelFormatFor;
 
 
 // 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
 template <class T> struct wxPixelFormatFor;
 

+#if wxUSE_IMAGE

 // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
 template <>
 // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
 template <>

-struct WXDLLEXPORT wxPixelFormatFor<wxImage>
+struct wxPixelFormatFor<wxImage>

 {
     typedef wxImagePixelFormat Format;
 };
 {
     typedef wxImagePixelFormat Format;
 };

+#endif //wxUSE_IMAGE

 
 // ----------------------------------------------------------------------------
 // wxPixelData
 
 // ----------------------------------------------------------------------------
 // wxPixelData


@@ -177,7 +212,7 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
     wxPixelDataBase is just a helper for wxPixelData: it contains things common
     to both wxImage and wxBitmap specializations.
  */
     wxPixelDataBase is just a helper for wxPixelData: it contains things common
     to both wxImage and wxBitmap specializations.
  */

-class WXDLLEXPORT wxPixelDataBase
+class wxPixelDataBase

 {
 public:
     // origin of the rectangular region we represent
 {
 public:
     // origin of the rectangular region we represent


@@ -187,6 +222,8 @@ public:
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
 
     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; }
 
     // the distance between two rows
     int GetRowStride() const { return m_stride; }
 


@@ -243,26 +280,28 @@ protected:
 
 // we need to define this skeleton template to mollify VC++
 template <class Image>
 
 // we need to define this skeleton template to mollify VC++
 template <class Image>

-struct WXDLLEXPORT wxPixelDataOut
+struct wxPixelDataOut

 {
     template <class PixelFormat>
 {
     template <class PixelFormat>

-    class WXDLLEXPORT wxPixelDataIn
+    class wxPixelDataIn

     {
     public:
         class Iterator { };
     };
 };
 
     {
     public:
         class Iterator { };
     };
 };
 

+#if wxUSE_IMAGE

 // wxPixelData specialization for wxImage: this is the simplest case as we
 // don't have to care about different pixel formats here
 template <>
 // wxPixelData specialization for wxImage: this is the simplest case as we
 // don't have to care about different pixel formats here
 template <>

-struct WXDLLEXPORT wxPixelDataOut<wxImage>
+struct wxPixelDataOut<wxImage>

 {
     // NB: this is a template class even though it doesn't use its template
     //     parameter because otherwise wxPixelData couldn't compile
     template <class dummyPixelFormat>
 {
     // NB: this is a template class even though it doesn't use its template
     //     parameter because otherwise wxPixelData couldn't compile
     template <class dummyPixelFormat>

-    class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+    class wxPixelDataIn : public wxPixelDataBase

     {
     {

+    public:

         // the type of the class we're working with
         typedef wxImage ImageType;
 
         // the type of the class we're working with
         typedef wxImage ImageType;
 


@@ -274,9 +313,6 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             // the pixel format we use
             typedef wxImagePixelFormat PixelFormat;
 
             // the pixel format we use
             typedef wxImagePixelFormat PixelFormat;
 

-            // the type of the pixel components
-            typedef typename PixelFormat::ChannelType ChannelType;
-

             // the pixel data we're working with
             typedef
                 wxPixelDataOut<wxImage>::wxPixelDataIn<PixelFormat> PixelData;
             // the pixel data we're working with
             typedef
                 wxPixelDataOut<wxImage>::wxPixelDataIn<PixelFormat> PixelData;


@@ -320,7 +356,7 @@ 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;
             }


@@ -371,11 +407,19 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             // data access
             // -----------
 
             // data access
             // -----------
 

-            // access to invidividual colour components
-            ChannelType& Red() { return m_ptr[PixelFormat::RED]; }
-            ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; }
-            ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; }
-            ChannelType& Alpha() { return *m_pAlpha; }
+            // access to individual colour components
+            PixelFormat::ChannelType& Red() { return m_pRGB[PixelFormat::RED]; }
+            PixelFormat::ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; }
+            PixelFormat::ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; }
+            PixelFormat::ChannelType& Alpha() { return *m_pAlpha; }
+
+            // address the pixel contents directly (always RGB, without alpha)
+            //
+            // this can't be used to modify the image as assigning a 32bpp
+            // value to 24bpp pixel would overwrite an extra byte in the next
+            // pixel or beyond the end of image
+            const typename PixelFormat::PixelType& Data()
+                { return *(typename PixelFormat::PixelType *)m_pRGB; }

 
         // private: -- see comment in the beginning of the file
 
 
         // private: -- see comment in the beginning of the file
 


@@ -391,7 +435,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         {
             m_width = image.GetWidth();
             m_height = image.GetHeight();
         {
             m_width = image.GetWidth();
             m_height = image.GetHeight();

-            m_stride = Iterator::SizePixel * m_width;
+            m_stride = Iterator::PixelFormat::SizePixel * m_width;

         }
 
         // initializes us with the given region of the specified image
         }
 
         // initializes us with the given region of the specified image


@@ -399,7 +443,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
                       const wxPoint& pt,
                       const wxSize& sz) : m_image(image), m_pixels(image)
         {
                       const wxPoint& pt,
                       const wxSize& sz) : m_image(image), m_pixels(image)
         {

-            m_stride = Iterator::SizePixel * m_width;
+            m_stride = Iterator::PixelFormat::SizePixel * m_width;

 
             InitRect(pt, sz);
         }
 
             InitRect(pt, sz);
         }


@@ -408,9 +452,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         wxPixelDataIn(ImageType& image,
                       const wxRect& rect) : m_image(image), m_pixels(image)
         {
         wxPixelDataIn(ImageType& image,
                       const wxRect& rect) : m_image(image), m_pixels(image)
         {

-            m_stride = Iterator::SizePixel * m_width;
+            m_stride = Iterator::PixelFormat::SizePixel * m_width;

 
 

-            InitRect(rect.GetPositions(), rect.GetSize());
+            InitRect(rect.GetPosition(), rect.GetSize());

         }
 
         // 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


@@ -437,14 +481,16 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         Iterator m_pixels;
     };
 };
         Iterator m_pixels;
     };
 };

+#endif //wxUSE_IMAGE

 
 

+#if wxUSE_GUI

 // wxPixelData specialization for wxBitmap: here things are more interesting as
 // we also have to support different pixel formats
 template <>
 // wxPixelData specialization for wxBitmap: here things are more interesting as
 // we also have to support different pixel formats
 template <>

-struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
+struct wxPixelDataOut<wxBitmap>

 {
     template <class Format>
 {
     template <class Format>

-    class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+    class wxPixelDataIn : public wxPixelDataBase

     {
     public:
         // the type of the class we're working with
     {
     public:
         // the type of the class we're working with


@@ -489,6 +535,12 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }
 
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }
 

+            // default constructor
+            Iterator()
+            {
+                m_ptr = NULL;
+            }
+

             // return true if this iterator is valid
             bool IsOk() const { return m_ptr != NULL; }
 
             // return true if this iterator is valid
             bool IsOk() const { return m_ptr != NULL; }
 


@@ -553,15 +605,18 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
             // address the pixel contents directly
             //
             // warning: the format is platform dependent
             // address the pixel contents directly
             //
             // warning: the format is platform dependent

+            //
+            // warning 2: assigning to Data() only works correctly for 16bpp or
+            //            32bpp formats but using it for 24bpp ones overwrites
+            //            one extra byte and so can't be done

             typename PixelFormat::PixelType& Data()
                 { return *(typename PixelFormat::PixelType *)m_ptr; }
 
         // private: -- see comment in the beginning of the file
 
             typename PixelFormat::PixelType& Data()
                 { return *(typename PixelFormat::PixelType *)m_ptr; }
 
         // 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;
         };
 
             ChannelType *m_ptr;
         };
 


@@ -576,7 +631,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         wxPixelDataIn(wxBitmap& bmp, const wxRect& rect)
             : 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());
+            InitRect(rect.GetPosition(), rect.GetSize());

         }
 
         wxPixelDataIn(wxBitmap& bmp, const wxPoint& pt, const wxSize& sz)
         }
 
         wxPixelDataIn(wxBitmap& bmp, const wxPoint& pt, const wxSize& sz)


@@ -595,11 +650,22 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         // dtor unlocks the bitmap
         ~wxPixelDataIn()
         {
         // dtor unlocks the bitmap
         ~wxPixelDataIn()
         {

-            m_bmp.UngetRawData(*this);
+            if ( m_pixels.IsOk() )
+            {
+#if defined(__WXMSW__) || defined(__WXMAC__)
+                // this is a hack to mark wxBitmap as using alpha channel
+                if ( Format::HasAlpha )
+                    m_bmp.UseAlpha();
+#endif
+                m_bmp.UngetRawData(*this);
+            }
+            // else: don't call UngetRawData() if GetRawData() failed

         }
 
         }
 

-        // call this to indicate that we should use the alpha channel
-        void UseAlpha() { m_bmp.UseAlpha(); }
+#if WXWIN_COMPATIBILITY_2_8
+        // not needed anymore, calls to it should be simply removed
+        wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
+#endif

 
     // private: -- see comment in the beginning of the file
 
 
     // private: -- see comment in the beginning of the file
 


@@ -621,32 +687,48 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
     };
 };
 
     };
 };
 

-template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
+#endif //wxUSE_GUI
+
+// FIXME-VC6: VC6 doesn't like typename in default template parameters while
+//            it is necessary with standard-conforming compilers, remove this
+//            #define and just use typename when we drop VC6 support
+#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
+    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+#else
+    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM typename
+#endif
+
+template <class Image,
+          class PixelFormat = wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+                                wxPixelFormatFor<Image>::Format >

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

-    wxPixelData(Image& image)
-        : wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(image)
-        {
-        }
+    typedef
+        typename wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
+        Base;

 
 

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

 
 

-    wxPixelData(Image& i, const wxRect& rect)
-        : wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>(i, rect)
-        {
-        }
+    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
 };
 
 // some "predefined" pixel data classes

+#if wxUSE_IMAGE

 typedef wxPixelData<wxImage> wxImagePixelData;
 typedef wxPixelData<wxImage> wxImagePixelData;

+#endif //wxUSE_IMAGE
+#if wxUSE_GUI

 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
 
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
 

+#endif //wxUSE_GUI
+

 // ----------------------------------------------------------------------------
 // wxPixelIterator
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPixelIterator
 // ----------------------------------------------------------------------------


@@ -664,13 +746,9 @@ typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
     partial template specialization then and neither VC6 nor VC7 provide it.
  */
 template < class Image, class PixelFormat = wxPixelFormatFor<Image> >
     partial template specialization then and neither VC6 nor VC7 provide it.
  */
 template < class Image, class PixelFormat = wxPixelFormatFor<Image> >

-struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
+struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator

 {
 };
 
 {
 };
 

-#ifdef __VISUALC__
-    #pragma warning(default: 4355)
-#endif
-
-#endif // _WX_RAWBMP_H_BASE_
-
+#endif // wxHAS_RAW_BITMAP
+#endif // _WX_RAWBMP_H_