X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd94e8aa4563b22e7c66c379625a8373d20720aa..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/common/imagxpm.cpp diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index c6ad6d6aa1..de2530e84c 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagxpm.cpp +// Name: src/common/imagxpm.cpp // Purpose: wxXPMHandler // Author: Vaclav Slavik, Robert Roebling // RCS-ID: $Id$ @@ -62,29 +62,25 @@ license is as follows: % */ -#ifdef __GNUG__ -#pragma implementation "imagxpm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_XPM + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/utils.h" #endif -#if wxUSE_XPM - #include "wx/imagxpm.h" #include "wx/wfstream.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/utils.h" #include "wx/xpmdecod.h" +#include "wx/filename.h" IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler) @@ -101,51 +97,48 @@ bool wxXPMHandler::LoadFile(wxImage *image, wxXPMDecoder decoder; wxImage img = decoder.ReadFile(stream); - if ( !img.Ok() ) - return FALSE; + if ( !img.IsOk() ) + return false; *image = img; - return TRUE; + return true; } bool wxXPMHandler::SaveFile(wxImage * image, wxOutputStream& stream, bool WXUNUSED(verbose)) { - wxString tmp; - char tmp_c; - // 1. count colours: #define MaxCixels 92 static const char Cixel[MaxCixels+1] = " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk" "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|"; - int chars_per_pixel; - int cols; int i, j, k; - cols = image->CountColours(); - chars_per_pixel = 1; + wxImageHistogram histogram; + int cols = int(image->ComputeHistogram(histogram)); + + int chars_per_pixel = 1; for ( k = MaxCixels; cols > k; k *= MaxCixels) chars_per_pixel++; - // 2. write the header: + // 2. write the header: wxString sName; if ( image->HasOption(wxIMAGE_OPTION_FILENAME) ) { - wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME), - NULL, &sName, NULL); + wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME), + NULL, &sName, NULL); sName << wxT("_xpm"); } - - if ( !sName.IsEmpty() ) - sName = wxString(wxT("/* XPM */\nstatic char *")) + sName; - else - sName = wxT("/* XPM */\nstatic char *xpm_data"); - stream.Write(sName.c_str(), sName.Len()); + + if ( !sName.empty() ) + sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName; + else + sName = wxT("/* XPM */\nstatic const char *xpm_data"); + stream.Write( (const char*) sName.ToAscii(), sName.Len() ); char tmpbuf[200]; // VS: 200b is safe upper bound for anything produced by sprintf below // (<101 bytes the string, neither %i can expand into more than 10 chars) - sprintf(tmpbuf, + sprintf(tmpbuf, "[] = {\n" "/* columns rows colors chars-per-pixel */\n" "\"%i %i %i %i\",\n", @@ -153,9 +146,6 @@ bool wxXPMHandler::SaveFile(wxImage * image, stream.Write(tmpbuf, strlen(tmpbuf)); // 3. create color symbols table: - wxImageHistogram histogram; - image->ComputeHistogram(histogram); - char *symbols_data = new char[cols * (chars_per_pixel+1)]; char **symbols = new char*[cols]; @@ -167,41 +157,41 @@ bool wxXPMHandler::SaveFile(wxImage * image, // 2b. generate colour table: for (wxImageHistogram::iterator entry = histogram.begin(); - entry != histogram.end(); entry++ ) + entry != histogram.end(); ++entry ) { unsigned long index = entry->second.index; symbols[index] = symbols_data + index * (chars_per_pixel+1); char *sym = symbols[index]; - k = index % MaxCixels; - sym[0] = Cixel[k]; - for (j = 1; j < chars_per_pixel; j++) + for (j = 0; j < chars_per_pixel; j++) { - k = ((index - k) / MaxCixels) % MaxCixels; - sym[j] = Cixel[k]; + sym[j] = Cixel[index % MaxCixels]; + index /= MaxCixels; } sym[j] = '\0'; unsigned long key = entry->first; if (key == 0) - tmp.Printf(wxT("\"%s c Black\",\n"), sym); + sprintf( tmpbuf, "\"%s c Black\",\n", sym); else if (key == mask_key) - tmp.Printf(wxT("\"%s c None\",\n"), sym); + sprintf( tmpbuf, "\"%s c None\",\n", sym); else - tmp.Printf(wxT("\"%s c #%s%s%s\",\n"), sym, - wxDecToHex((unsigned char)(key >> 16)).c_str(), - wxDecToHex((unsigned char)(key >> 8)).c_str(), - wxDecToHex((unsigned char)(key)).c_str()); - stream.Write(tmp.mb_str(), tmp.Length()); + { + wxByte r = wxByte(key >> 16); + wxByte g = wxByte(key >> 8); + wxByte b = wxByte(key); + sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b); + } + stream.Write( tmpbuf, strlen(tmpbuf) ); } - tmp = wxT("/* pixels */\n"); - stream.Write(tmp.mb_str(), tmp.Length()); + stream.Write("/* pixels */\n", 13); unsigned char *data = image->GetData(); for (j = 0; j < image->GetHeight(); j++) { + char tmp_c; tmp_c = '\"'; stream.Write(&tmp_c, 1); for (i = 0; i < image->GetWidth(); i++, data += 3) { @@ -215,20 +205,20 @@ bool wxXPMHandler::SaveFile(wxImage * image, } tmp_c = '\n'; stream.Write(&tmp_c, 1); } - tmp = wxT("};\n"); - stream.Write(tmp.mb_str(), 3); + stream.Write("};\n", 3 ); // Clean up: delete[] symbols; delete[] symbols_data; - return TRUE; + return true; } bool wxXPMHandler::DoCanRead(wxInputStream& stream) { wxXPMDecoder decoder; return decoder.CanRead(stream); + // it's ok to modify the stream position here } #endif // wxUSE_STREAMS