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

changed wxImage::ComputeHistogram to use wxHashMap

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-07 18:11:39 +00:00
parent d353bd452e
commit 952ae1e88b
6 changed files with 100 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/gtk/cursor.cpp
View File

@@ -205,42 +205,42 @@ wxCursor::wxCursor( const wxImage & image )
//it seems a waste of effort to copy the image
//but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy();
wxHashTable hTable;
wxImageHistogram histogram;
//colors as rrggbb
unsigned long key;
unsigned long value;
unsigned long keyMaskColor = 0;
if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
if (bHasMask)
keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram( hTable );
tmpImage.ComputeHistogram(histogram);
long MostFreqCol = 0 ; long nMost = 0;
long NextFreqCol = 0 ; long nNext = 0;
long value ;
hTable.BeginFind();
wxNode *node = NULL;
while ((node = hTable.Next()) != NULL)
long MostFreqCol = 0;
unsigned long nMost = 0;
long NextFreqCol = 0;
unsigned long nNext = 0;
wxImageHistogram::iterator entry = histogram.begin();
while ( entry != histogram.end() )
{
wxHNode *hnode = (wxHNode*) node->GetData();
value = hnode->value;
key = node->GetKeyInteger() ;
if (!bHasMask || (key != keyMaskColor) )
value = entry->second.value;
key = entry->first;
if ( !bHasMask || (key != keyMaskColor) )
{
if (value > nMost)
if (value > nMost)
{
nMost = value;
MostFreqCol = key;
nMost = value;
MostFreqCol = key;
}
else
if (value > nNext)
else if (value > nNext)
{
nNext = value ;
NextFreqCol = key;
nNext = value;
NextFreqCol = key;
}
}
}
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
(unsigned char)(MostFreqCol >> 8),
(unsigned char)(MostFreqCol) ) ;
@@ -249,20 +249,18 @@ wxCursor::wxCursor( const wxImage & image )
(unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ;
int hotSpotX=0;
int hotSpotY=0;
if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0;
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0;
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits,
w, h );
@@ -278,7 +276,6 @@ wxCursor::wxCursor( const wxImage & image )
gdk_bitmap_unref( mask );
delete [] bits ;
delete [] maskBits;
}
#endif