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

fixed infinite loop in wxCursor(wxImage) ctor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-12 14:12:19 +00:00
parent 1a685a59a0
commit fa1fcc6642
2 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/gtk/cursor.cpp
View File

@@ -211,24 +211,21 @@ wxCursor::wxCursor( const wxImage & image )
keyMaskColor = 0; keyMaskColor = 0;
} }
// find the most frequent color(s) it seems a waste of effort to copy the // find the most frequent color(s)
// image but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy();
wxImageHistogram histogram; wxImageHistogram histogram;
image.ComputeHistogram(histogram);
// colors as rrggbb // colors as rrggbb
unsigned long key; unsigned long key;
unsigned long value; unsigned long value;
tmpImage.ComputeHistogram(histogram); long colMostFreq = 0;
long MostFreqCol = 0;
unsigned long nMost = 0; unsigned long nMost = 0;
long NextFreqCol = 0; long colNextMostFreq = 0;
unsigned long nNext = 0; unsigned long nNext = 0;
wxImageHistogram::iterator entry = histogram.begin(); for ( wxImageHistogram::iterator entry = histogram.begin();
entry != histogram.end();
while ( entry != histogram.end() ) ++entry )
{ {
value = entry->second.value; value = entry->second.value;
key = entry->first; key = entry->first;
@@ -237,46 +234,55 @@ wxCursor::wxCursor( const wxImage & image )
if (value > nMost) if (value > nMost)
{ {
nMost = value; nMost = value;
MostFreqCol = key; colMostFreq = key;
} }
else if (value > nNext) else if (value > nNext)
{ {
nNext = value; nNext = value;
NextFreqCol = key; colNextMostFreq = key;
} }
} }
} }
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
(unsigned char)(MostFreqCol >> 8), (unsigned char)(colMostFreq >> 8),
(unsigned char)(MostFreqCol) ); (unsigned char)(colMostFreq) );
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
(unsigned char)(NextFreqCol >> 8), (unsigned char)(colNextMostFreq >> 8),
(unsigned char)(NextFreqCol) ); (unsigned char)(colNextMostFreq) );
int hotSpotX=0; int hotSpotX;
int hotSpotY=0; int hotSpotY;
if (image.HasOption(wxCUR_HOTSPOT_X)) if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X); hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
else
hotSpotX = 0;
if (image.HasOption(wxCUR_HOTSPOT_Y)) if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y); hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
else
hotSpotY = 0;
if (hotSpotX < 0 || hotSpotX >= w) if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0; hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h) if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0; hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, GdkBitmap *data = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
w, h ); (gchar *) bits, w, h);
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, GdkBitmap *mask = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
w, h ); (gchar *) maskBits, w, h);
m_refData = new wxCursorRefData; m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
data, mask, fg.GetColor(), bg.GetColor(), (
hotSpotX, hotSpotY ); data,
mask,
fg.GetColor(), bg.GetColor(),
hotSpotX, hotSpotY
);
gdk_bitmap_unref( data ); gdk_bitmap_unref( data );
gdk_bitmap_unref( mask ); gdk_bitmap_unref( mask );

60
src/gtk1/cursor.cpp
View File

@@ -211,24 +211,21 @@ wxCursor::wxCursor( const wxImage & image )
keyMaskColor = 0; keyMaskColor = 0;
} }
// find the most frequent color(s) it seems a waste of effort to copy the // find the most frequent color(s)
// image but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy();
wxImageHistogram histogram; wxImageHistogram histogram;
image.ComputeHistogram(histogram);
// colors as rrggbb // colors as rrggbb
unsigned long key; unsigned long key;
unsigned long value; unsigned long value;
tmpImage.ComputeHistogram(histogram); long colMostFreq = 0;
long MostFreqCol = 0;
unsigned long nMost = 0; unsigned long nMost = 0;
long NextFreqCol = 0; long colNextMostFreq = 0;
unsigned long nNext = 0; unsigned long nNext = 0;
wxImageHistogram::iterator entry = histogram.begin(); for ( wxImageHistogram::iterator entry = histogram.begin();
entry != histogram.end();
while ( entry != histogram.end() ) ++entry )
{ {
value = entry->second.value; value = entry->second.value;
key = entry->first; key = entry->first;
@@ -237,46 +234,55 @@ wxCursor::wxCursor( const wxImage & image )
if (value > nMost) if (value > nMost)
{ {
nMost = value; nMost = value;
MostFreqCol = key; colMostFreq = key;
} }
else if (value > nNext) else if (value > nNext)
{ {
nNext = value; nNext = value;
NextFreqCol = key; colNextMostFreq = key;
} }
} }
} }
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
(unsigned char)(MostFreqCol >> 8), (unsigned char)(colMostFreq >> 8),
(unsigned char)(MostFreqCol) ); (unsigned char)(colMostFreq) );
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
(unsigned char)(NextFreqCol >> 8), (unsigned char)(colNextMostFreq >> 8),
(unsigned char)(NextFreqCol) ); (unsigned char)(colNextMostFreq) );
int hotSpotX=0; int hotSpotX;
int hotSpotY=0; int hotSpotY;
if (image.HasOption(wxCUR_HOTSPOT_X)) if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X); hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
else
hotSpotX = 0;
if (image.HasOption(wxCUR_HOTSPOT_Y)) if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y); hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
else
hotSpotY = 0;
if (hotSpotX < 0 || hotSpotX >= w) if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0; hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h) if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0; hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, GdkBitmap *data = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
w, h ); (gchar *) bits, w, h);
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, GdkBitmap *mask = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
w, h ); (gchar *) maskBits, w, h);
m_refData = new wxCursorRefData; m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
data, mask, fg.GetColor(), bg.GetColor(), (
hotSpotX, hotSpotY ); data,
mask,
fg.GetColor(), bg.GetColor(),
hotSpotX, hotSpotY
);
gdk_bitmap_unref( data ); gdk_bitmap_unref( data );
gdk_bitmap_unref( mask ); gdk_bitmap_unref( mask );