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

2 warnings from Solaris build log fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-24 17:04:44 +00:00
parent b97fa7cfd1
commit 069d0f27ef
1 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/common/image.cpp
View File

@@ -1798,50 +1798,50 @@ private:
wxSearchColor::wxSearchColor( void )
{
this->size = 0;
this->colors = (XColor*) NULL;
this->color = (unsigned int *) NULL;
this->entry = (int*) NULL;
size = 0;
colors = (XColor*) NULL;
color = (unsigned int *) NULL;
entry = (int*) NULL;
this->bottom = 0;
this->top = 0;
bottom = 0;
top = 0;
}
wxSearchColor::wxSearchColor( int size, XColor *colors )
wxSearchColor::wxSearchColor( int size_, XColor *colors_ )
{
int i;
this->size = size;
this->colors = colors;
this->color = new unsigned int[size];
this->entry = new int [size];
size = size_;
colors = colors_;
color = new unsigned int[size];
entry = new int [size];
for (i = 0; i < this->size; i++ ) {
this->entry[i] = -1;
for (i = 0; i < size; i++ ) {
entry[i] = -1;
}
this->bottom = this->top = ( size >> 1 );
bottom = top = ( size >> 1 );
}
wxSearchColor::~wxSearchColor( void )
{
if ( this->color ) delete this->color;
if ( this->entry ) delete this->entry;
if ( color ) delete color;
if ( entry ) delete entry;
}
int wxSearchColor::SearchColor( int r, int g, int b )
{
unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b;
int begin = this->bottom;
int end = this->top;
int begin = bottom;
int end = top;
int middle;
while ( begin <= end ) {
middle = ( begin + end ) >> 1;
if ( value == this->color[middle] ) {
return( this->entry[middle] );
} else if ( value < this->color[middle] ) {
if ( value == color[middle] ) {
return( entry[middle] );
} else if ( value < color[middle] ) {
end = middle - 1;
} else {
begin = middle + 1;
@@ -1865,47 +1865,47 @@ int wxSearchColor::AddColor( unsigned int value, int pos )
if (sum < max) { pixel = i; max = sum; }
}
if ( this->entry[pos] < 0 ) {
this->color[pos] = value;
this->entry[pos] = pixel;
} else if ( value < this->color[pos] ) {
if ( entry[pos] < 0 ) {
color[pos] = value;
entry[pos] = pixel;
} else if ( value < color[pos] ) {
if ( this->bottom > 0 ) {
for ( i = this->bottom; i < pos; i++ ) {
this->color[i-1] = this->color[i];
this->entry[i-1] = this->entry[i];
if ( bottom > 0 ) {
for ( i = bottom; i < pos; i++ ) {
color[i-1] = color[i];
entry[i-1] = entry[i];
}
this->bottom--;
this->color[pos-1] = value;
this->entry[pos-1] = pixel;
} else if ( this->top < this->size-1 ) {
for ( i = this->top; i >= pos; i-- ) {
this->color[i+1] = this->color[i];
this->entry[i+1] = this->entry[i];
bottom--;
color[pos-1] = value;
entry[pos-1] = pixel;
} else if ( top < size-1 ) {
for ( i = top; i >= pos; i-- ) {
color[i+1] = color[i];
entry[i+1] = entry[i];
}
this->top++;
this->color[pos] = value;
this->entry[pos] = pixel;
top++;
color[pos] = value;
entry[pos] = pixel;
}
} else {
if ( this->top < this->size-1 ) {
for ( i = this->top; i > pos; i-- ) {
this->color[i+1] = this->color[i];
this->entry[i+1] = this->entry[i];
if ( top < size-1 ) {
for ( i = top; i > pos; i-- ) {
color[i+1] = color[i];
entry[i+1] = entry[i];
}
this->top++;
this->color[pos+1] = value;
this->entry[pos+1] = pixel;
} else if ( this->bottom > 0 ) {
for ( i = this->bottom; i < pos; i++ ) {
this->color[i-1] = this->color[i];
this->entry[i-1] = this->entry[i];
top++;
color[pos+1] = value;
entry[pos+1] = pixel;
} else if ( bottom > 0 ) {
for ( i = bottom; i < pos; i++ ) {
color[i-1] = color[i];
entry[i-1] = entry[i];
}
this->bottom--;
this->color[pos] = value;
this->entry[pos] = pixel;
bottom--;
color[pos] = value;
entry[pos] = pixel;
}
}