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

get color count from ComputeHistogram, use sprintf for hex conversion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-07-03 17:17:20 +00:00
parent 3e755df90b
commit 2a0eb543b2
1 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/imagxpm.cpp
View File

@@ -102,36 +102,20 @@ bool wxXPMHandler::LoadFile(wxImage *image,
return true; return true;
} }
static char hexArray[] = "0123456789ABCDEF";
static void DecToHex(int dec, char *buf)
{
int firstDigit = (int)(dec/16.0);
int secondDigit = (int)(dec - (firstDigit*16.0));
buf[0] = hexArray[firstDigit];
buf[1] = hexArray[secondDigit];
buf[2] = 0;
}
bool wxXPMHandler::SaveFile(wxImage * image, bool wxXPMHandler::SaveFile(wxImage * image,
wxOutputStream& stream, bool WXUNUSED(verbose)) wxOutputStream& stream, bool WXUNUSED(verbose))
{ {
wxString tmp;
char tmp_c;
// 1. count colours: // 1. count colours:
#define MaxCixels 92 #define MaxCixels 92
static const char Cixel[MaxCixels+1] = static const char Cixel[MaxCixels+1] =
" .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk" " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
"lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|"; "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
int chars_per_pixel;
int cols;
int i, j, k; int i, j, k;
cols = image->CountColours(); wxImageHistogram histogram;
chars_per_pixel = 1; int cols = int(image->ComputeHistogram(histogram));
int chars_per_pixel = 1;
for ( k = MaxCixels; cols > k; k *= MaxCixels) for ( k = MaxCixels; cols > k; k *= MaxCixels)
chars_per_pixel++; chars_per_pixel++;
@@ -161,9 +145,6 @@ bool wxXPMHandler::SaveFile(wxImage * image,
stream.Write(tmpbuf, strlen(tmpbuf)); stream.Write(tmpbuf, strlen(tmpbuf));
// 3. create color symbols table: // 3. create color symbols table:
wxImageHistogram histogram;
image->ComputeHistogram(histogram);
char *symbols_data = new char[cols * (chars_per_pixel+1)]; char *symbols_data = new char[cols * (chars_per_pixel+1)];
char **symbols = new char*[cols]; char **symbols = new char*[cols];
@@ -196,23 +177,20 @@ bool wxXPMHandler::SaveFile(wxImage * image,
sprintf( tmpbuf, "\"%s c None\",\n", sym); sprintf( tmpbuf, "\"%s c None\",\n", sym);
else else
{ {
char rbuf[3]; wxByte r = wxByte(key >> 16);
DecToHex( (unsigned char)(key >> 16), rbuf ); wxByte g = wxByte(key >> 8);
char gbuf[3]; wxByte b = wxByte(key);
DecToHex( (unsigned char)(key >> 8), gbuf ); sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b);
char bbuf[3];
DecToHex( (unsigned char)(key), bbuf );
sprintf( tmpbuf, "\"%s c #%s%s%s\",\n", sym, rbuf, gbuf, bbuf );
} }
stream.Write( tmpbuf, strlen(tmpbuf) ); stream.Write( tmpbuf, strlen(tmpbuf) );
} }
tmp = wxT("/* pixels */\n"); stream.Write("/* pixels */\n", 13);
stream.Write( (const char*) tmp.ToAscii(), tmp.length() );
unsigned char *data = image->GetData(); unsigned char *data = image->GetData();
for (j = 0; j < image->GetHeight(); j++) for (j = 0; j < image->GetHeight(); j++)
{ {
char tmp_c;
tmp_c = '\"'; stream.Write(&tmp_c, 1); tmp_c = '\"'; stream.Write(&tmp_c, 1);
for (i = 0; i < image->GetWidth(); i++, data += 3) for (i = 0; i < image->GetWidth(); i++, data += 3)
{ {
@@ -226,8 +204,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
} }
tmp_c = '\n'; stream.Write(&tmp_c, 1); tmp_c = '\n'; stream.Write(&tmp_c, 1);
} }
tmp = wxT("};\n"); stream.Write("};\n", 3 );
stream.Write( (const char*) tmp.ToAscii(), 3 );
// Clean up: // Clean up:
delete[] symbols; delete[] symbols;