projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better fix
[wxWidgets.git]
/
include
/
wx
/
rawbmp.h
diff --git
a/include/wx/rawbmp.h
b/include/wx/rawbmp.h
index 43e20ab6ede42c9d5147fd996b375345a668a55a..3e599a602b287855d457b70de368a9f31d7cb957 100644
(file)
--- a/
include/wx/rawbmp.h
+++ b/
include/wx/rawbmp.h
@@
-9,8
+9,8
@@
// 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/image.h"
#include "wx/image.h"
@@
-71,11
+71,6
@@
}
*/
}
*/
-#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 WXDLLEXPORT with classes in this file because VC++ has
problems with exporting inner class defined inside a specialization of a
/*
Note: we do not use WXDLLEXPORT with classes in this file because VC++ has
problems with exporting inner class defined inside a specialization of a
@@
-169,9
+164,14
@@
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
- // Under GTK+ 2.X we use GdkPixbuf, which
should be
RGBA
+ // Under GTK+ 2.X we use GdkPixbuf, which
is standard RGB or
RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
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
#define wxPIXEL_FORMAT_ALPHA 3
#endif
@@
-525,6
+525,12
@@
struct 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; }
@@
-630,11
+636,22
@@
struct 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
@@
-655,15
+672,8
@@
struct wxPixelDataOut<wxBitmap>
}
};
};
}
};
};
-#endif //wxUSE_GUI
-#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__
+#endif //wxUSE_GUI
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
class wxPixelData :
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
class wxPixelData :
@@
-684,7
+694,6
@@
public:
}
};
}
};
-
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
@@
-712,14
+721,8
@@
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 wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
+struct wxPixelIterator :
public
wxPixelData<Image, PixelFormat>::Iterator
{
};
{
};
-#ifdef __VISUALC__
- #pragma warning(default: 4355)
- #pragma warning(default: 4097)
-#endif
-
-#endif // _WX_RAWBMP_H_BASE_
-
+#endif // _WX_RAWBMP_H_