Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-02 09:59:22 +00:00
parent 21a77f6e50
commit 0fc5dbf52a
6 changed files with 172 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imagfill.cpp
View File

@@ -17,13 +17,13 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/defs.h"
#if wxUSE_IMAGE #if wxUSE_IMAGE
#include "wx/image.h" #include "wx/image.h"
#include "wx/brush.h"
#include "wx/pen.h" #ifndef WX_PRECOMP
#include "wx/brush.h"
#endif
// DoFloodFill // DoFloodFill
// Fills with the colour extracted from fillBrush, starting at x,y until either // Fills with the colour extracted from fillBrush, starting at x,y until either

56
src/gtk/cursor.cpp
View File

@@ -147,19 +147,19 @@ wxCursor::wxCursor( const wxCursor &cursor )
} }
#if wxUSE_IMAGE #if wxUSE_IMAGE
wxCursor::wxCursor( const wxImage & image ) wxCursor::wxCursor( const wxImage & image )
{ {
unsigned char * rgbBits = image.GetData(); unsigned char * rgbBits = image.GetData();
int w = image.GetWidth() ; int w = image.GetWidth() ;
int h = image.GetHeight() ; int h = image.GetHeight();
bool bHasMask = image.HasMask() ; bool bHasMask = image.HasMask();
int imagebitcount = (w*h)/8; int imagebitcount = (w*h)/8;
unsigned char r, g, b ;
unsigned char * bits = new unsigned char [imagebitcount]; unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount]; unsigned char * maskBits = new unsigned char [imagebitcount];
int i,j, i8; unsigned char c, cMask; int i, j, i8; unsigned char c, cMask;
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
{ {
bits[i] = 0; bits[i] = 0;
@@ -169,18 +169,21 @@ wxCursor::wxCursor( const wxImage & image )
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
// possible overflow if we do the summation first ? // possible overflow if we do the summation first ?
c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ; c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
//if average value is > mid grey //if average value is > mid grey
if (c>127) if (c>127)
bits[i] = bits[i] | cMask ; bits[i] = bits[i] | cMask;
cMask = cMask * 2 ; cMask = cMask * 2;
} }
} }
unsigned long keyMaskColor;
if (bHasMask) if (bHasMask)
{ {
r = image.GetMaskRed() ; unsigned char
g = image.GetMaskGreen() ; r = image.GetMaskRed(),
b = image.GetMaskBlue() ; g = image.GetMaskGreen(),
b = image.GetMaskBlue();
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
{ {
@@ -191,28 +194,30 @@ wxCursor::wxCursor( const wxImage & image )
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b) if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask ; maskBits[i] = maskBits[i] | cMask;
cMask = cMask * 2 ; cMask = cMask * 2;
} }
} }
keyMaskColor = (r << 16) | (g << 8) | b;
} }
else else // no mask
{ {
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
maskBits[i]= 0xFF ; maskBits[i] = 0xFF;
// init it to avoid compiler warnings
keyMaskColor = 0;
} }
//find the most frequent color(s)
//it seems a waste of effort to copy the image // find the most frequent color(s) it seems a waste of effort to copy the
//but otherwise we need to remove the const modifier ?? // image but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy(); wxImage tmpImage = image.Copy();
wxImageHistogram histogram; wxImageHistogram histogram;
//colors as rrggbb // colors as rrggbb
unsigned long key; unsigned long key;
unsigned long value; unsigned long value;
unsigned long keyMaskColor = 0;
if (bHasMask)
keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram(histogram); tmpImage.ComputeHistogram(histogram);
@@ -243,11 +248,11 @@ wxCursor::wxCursor( const wxImage & image )
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
(unsigned char)(MostFreqCol >> 8), (unsigned char)(MostFreqCol >> 8),
(unsigned char)(MostFreqCol) ) ; (unsigned char)(MostFreqCol) );
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
(unsigned char)(NextFreqCol >> 8), (unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ; (unsigned char)(NextFreqCol) );
int hotSpotX=0; int hotSpotX=0;
int hotSpotY=0; int hotSpotY=0;
@@ -274,10 +279,11 @@ wxCursor::wxCursor( const wxImage & image )
gdk_bitmap_unref( data ); gdk_bitmap_unref( data );
gdk_bitmap_unref( mask ); gdk_bitmap_unref( mask );
delete [] bits ; delete [] bits;
delete [] maskBits; delete [] maskBits;
} }
#endif
#endif // wxUSE_IMAGE
wxCursor::~wxCursor() wxCursor::~wxCursor()
{ {

3
src/gtk/window.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/module.h"
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #include "wx/dnd.h"
@@ -39,7 +40,7 @@
#endif // wxUSE_CARET #endif // wxUSE_CARET
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
#include "wx/textctrl.h" #include "wx/textctrl.h"
#endif #endif
#include "wx/menu.h" #include "wx/menu.h"

56
src/gtk1/cursor.cpp
View File

@@ -147,19 +147,19 @@ wxCursor::wxCursor( const wxCursor &cursor )
} }
#if wxUSE_IMAGE #if wxUSE_IMAGE
wxCursor::wxCursor( const wxImage & image ) wxCursor::wxCursor( const wxImage & image )
{ {
unsigned char * rgbBits = image.GetData(); unsigned char * rgbBits = image.GetData();
int w = image.GetWidth() ; int w = image.GetWidth() ;
int h = image.GetHeight() ; int h = image.GetHeight();
bool bHasMask = image.HasMask() ; bool bHasMask = image.HasMask();
int imagebitcount = (w*h)/8; int imagebitcount = (w*h)/8;
unsigned char r, g, b ;
unsigned char * bits = new unsigned char [imagebitcount]; unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount]; unsigned char * maskBits = new unsigned char [imagebitcount];
int i,j, i8; unsigned char c, cMask; int i, j, i8; unsigned char c, cMask;
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
{ {
bits[i] = 0; bits[i] = 0;
@@ -169,18 +169,21 @@ wxCursor::wxCursor( const wxImage & image )
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
// possible overflow if we do the summation first ? // possible overflow if we do the summation first ?
c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ; c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
//if average value is > mid grey //if average value is > mid grey
if (c>127) if (c>127)
bits[i] = bits[i] | cMask ; bits[i] = bits[i] | cMask;
cMask = cMask * 2 ; cMask = cMask * 2;
} }
} }
unsigned long keyMaskColor;
if (bHasMask) if (bHasMask)
{ {
r = image.GetMaskRed() ; unsigned char
g = image.GetMaskGreen() ; r = image.GetMaskRed(),
b = image.GetMaskBlue() ; g = image.GetMaskGreen(),
b = image.GetMaskBlue();
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
{ {
@@ -191,28 +194,30 @@ wxCursor::wxCursor( const wxImage & image )
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b) if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask ; maskBits[i] = maskBits[i] | cMask;
cMask = cMask * 2 ; cMask = cMask * 2;
} }
} }
keyMaskColor = (r << 16) | (g << 8) | b;
} }
else else // no mask
{ {
for (i=0; i<imagebitcount; i++) for (i=0; i<imagebitcount; i++)
maskBits[i]= 0xFF ; maskBits[i] = 0xFF;
// init it to avoid compiler warnings
keyMaskColor = 0;
} }
//find the most frequent color(s)
//it seems a waste of effort to copy the image // find the most frequent color(s) it seems a waste of effort to copy the
//but otherwise we need to remove the const modifier ?? // image but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy(); wxImage tmpImage = image.Copy();
wxImageHistogram histogram; wxImageHistogram histogram;
//colors as rrggbb // colors as rrggbb
unsigned long key; unsigned long key;
unsigned long value; unsigned long value;
unsigned long keyMaskColor = 0;
if (bHasMask)
keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram(histogram); tmpImage.ComputeHistogram(histogram);
@@ -243,11 +248,11 @@ wxCursor::wxCursor( const wxImage & image )
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
(unsigned char)(MostFreqCol >> 8), (unsigned char)(MostFreqCol >> 8),
(unsigned char)(MostFreqCol) ) ; (unsigned char)(MostFreqCol) );
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
(unsigned char)(NextFreqCol >> 8), (unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ; (unsigned char)(NextFreqCol) );
int hotSpotX=0; int hotSpotX=0;
int hotSpotY=0; int hotSpotY=0;
@@ -274,10 +279,11 @@ wxCursor::wxCursor( const wxImage & image )
gdk_bitmap_unref( data ); gdk_bitmap_unref( data );
gdk_bitmap_unref( mask ); gdk_bitmap_unref( mask );
delete [] bits ; delete [] bits;
delete [] maskBits; delete [] maskBits;
} }
#endif
#endif // wxUSE_IMAGE
wxCursor::~wxCursor() wxCursor::~wxCursor()
{ {

3
src/gtk1/window.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/module.h"
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #include "wx/dnd.h"
@@ -39,7 +40,7 @@
#endif // wxUSE_CARET #endif // wxUSE_CARET
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
#include "wx/textctrl.h" #include "wx/textctrl.h"
#endif #endif
#include "wx/menu.h" #include "wx/menu.h"

6
src/unix/utilsx11.cpp
View File

@@ -59,6 +59,12 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
gMask = image.GetMaskGreen(); gMask = image.GetMaskGreen();
bMask = image.GetMaskBlue(); bMask = image.GetMaskBlue();
} }
else // no mask, but still init the variables to avoid warnings
{
rMask =
gMask =
bMask = 0;
}
*ptr++ = width; *ptr++ = width;
*ptr++ = height; *ptr++ = height;