projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxWS_EX_VALIDATE_RECURSIVELY
[wxWidgets.git]
/
src
/
mgl
/
bitmap.cpp
diff --git
a/src/mgl/bitmap.cpp
b/src/mgl/bitmap.cpp
index 8ab1f1f99eacfd339de457f9c599f1c4f151d48a..bef5fc7e40e0e8425e44c3086b7603bc2fa77b45 100644
(file)
--- a/
src/mgl/bitmap.cpp
+++ b/
src/mgl/bitmap.cpp
@@
-6,7
+6,7
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "bitmap.h"
#endif
#pragma implementation "bitmap.h"
#endif
@@
-845,8
+845,8
@@
bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
for (x = 0; x < bmp->width; x++, s ++)
{
s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
for (x = 0; x < bmp->width; x++, s ++)
{
- if ( ((((*s) >> bmp->pf->
rsvdPos) & bmp->pf->rsvd
Mask)
- << bmp->pf->
rsvd
Adjust) < 128 )
+ if ( ((((*s) >> bmp->pf->
alphaPos) & bmp->pf->alpha
Mask)
+ << bmp->pf->
alpha
Adjust) < 128 )
*s = 0;
else
*s = 0x00FFFFFF; // white
*s = 0;
else
*s = 0x00FFFFFF; // white