diff options
Diffstat (limited to 'src/gui/image/qxbmhandler.cpp')
| -rw-r--r-- | src/gui/image/qxbmhandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index c3ab5fbb1d..8206fe3b29 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -10,12 +10,14 @@ #include <qiodevice.h> #include <qloggingcategory.h> #include <qvariant.h> +#include <private/qtools_p.h> #include <stdio.h> -#include <ctype.h> QT_BEGIN_NAMESPACE +using namespace QtMiscUtils; + Q_DECLARE_LOGGING_CATEGORY(lcImageIo) /***************************************************************************** @@ -24,8 +26,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcImageIo) static inline int hex2byte(char *p) { - return ((isdigit((uchar) *p) ? *p - '0' : toupper((uchar) *p) - 'A' + 10) << 4) | - (isdigit((uchar) *(p+1)) ? *(p+1) - '0' : toupper((uchar) *(p+1)) - 'A' + 10); + return QtMiscUtils::fromHex(p[0]) * 16 | QtMiscUtils::fromHex(p[1]); } static bool read_xbm_header(QIODevice *device, int& w, int& h) @@ -55,11 +56,9 @@ static bool read_xbm_header(QIODevice *device, int& w, int& h) } auto parseDefine = [] (const char *buf, int len) -> int { - auto isAsciiLetterOrNumber = [] (char ch) -> bool { - return (ch >= '0' && ch <= '9') || - (ch >= 'A' && ch <= 'Z') || - (ch >= 'a' && ch <= 'z') || - ch == '_' || ch == '.'; + auto checkChar = [] (char ch) -> bool { + return isAsciiLetterOrNumber(ch) + || ch == '_' || ch == '.'; }; auto isAsciiSpace = [] (char ch) -> bool { return ch == ' ' || ch == '\t'; @@ -71,7 +70,7 @@ static bool read_xbm_header(QIODevice *device, int& w, int& h) int index = defineLen; while (buf[index] && isAsciiSpace(buf[index])) ++index; - while (buf[index] && isAsciiLetterOrNumber(buf[index])) + while (buf[index] && checkChar(buf[index])) ++index; while (buf[index] && isAsciiSpace(buf[index])) ++index; @@ -129,9 +128,10 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage) while (y < h) { // for all encoded bytes... if (p && p < (buf + readBytes - 3)) { // p = "0x.." - if (!isxdigit(p[2]) || !isxdigit(p[3])) + const int byte = hex2byte(p + 2); + if (byte < 0) // non-hex char encountered return false; - *b++ = hex2byte(p+2); + *b++ = byte; p += 2; if (++x == w && ++y < h) { b = outImage->scanLine(y); @@ -164,7 +164,7 @@ static bool write_xbm_image(const QImage &sourceImage, QIODevice *device, const int h = image.height(); int i; QString s = fileName; // get file base name - int msize = s.length() + 100; + int msize = s.size() + 100; char *buf = new char[msize]; qsnprintf(buf, msize, "#define %s_width %d\n", s.toUtf8().data(), w); |