Fix buffer overrun in Linux/x86_64 (Pixel is a 64 bit long, passing
a 32 bit int pointer to XtVaGetValues will cause trouble). Using a long should suffice. A configure test would be better. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,11 +92,11 @@ protected:
|
||||
// if roundToWhite == true then the colour will be set to white unless
|
||||
// it is RGB 0x000000;if roundToWhite == true the colour wull be set to
|
||||
// black unless it id RGB 0xffffff
|
||||
int CalculatePixel(wxColour& colour, wxColour& curCol,
|
||||
bool roundToWhite) const;
|
||||
WXPixel CalculatePixel(wxColour& colour, wxColour& curCol,
|
||||
bool roundToWhite) const;
|
||||
// sets the foreground pixel taking into account the
|
||||
// currently selected logical operation
|
||||
void SetForegroundPixelWithLogicalFunction(int pixel);
|
||||
void SetForegroundPixelWithLogicalFunction(WXPixel pixel);
|
||||
|
||||
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
||||
int style = wxFLOOD_SURFACE);
|
||||
@@ -153,7 +153,7 @@ protected:
|
||||
WXRegion m_clipRegion;
|
||||
|
||||
// Not sure if we'll need all of these
|
||||
int m_backgroundPixel;
|
||||
WXPixel m_backgroundPixel;
|
||||
wxColour m_currentColour;
|
||||
int m_currentPenWidth ;
|
||||
int m_currentPenJoin ;
|
||||
|
Reference in New Issue
Block a user