Extract QImage::Format parsing into its own header

Use the array-of-strings suggested by David Faure so that only one list
has to be maintained instead of three.

REVIEW: 116567
This commit is contained in:
Alex Merry 2014-03-03 12:40:51 +00:00
parent e29a897cb9
commit 895305050c
2 changed files with 80 additions and 110 deletions

73
tests/format-enum.h Normal file
View File

@ -0,0 +1,73 @@
/*
* Copyright 2014 Alex Merry <alex.merry@kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) version 3, or any
* later version accepted by the membership of KDE e.V. (or its
* successor approved by the membership of KDE e.V.), which shall
* act as a proxy defined in Section 6 of version 3 of the license.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <QImage>
// Generated from QImage::Format enum
static const char * qimage_format_enum_names[] = {
"Invalid",
"Mono",
"MonoLSB",
"Indexed8",
"RGB32",
"ARGB32",
"ARGB32_Premultiplied",
"RGB16",
"ARGB8565_Premultiplied",
"RGB666",
"ARGB6666_Premultiplied",
"RGB555",
"ARGB8555_Premultiplied",
"RGB888",
"RGB444",
"ARGB4444_Premultiplied",
"RGBX8888",
"RGBA8888",
"RGBA8888_Premultiplied"
};
// Never claim there are more than QImage::NImageFormats supported formats.
// This is future-proofing against the above list being extended.
static const int qimage_format_enum_names_count =
(sizeof(qimage_format_enum_names) / sizeof(*qimage_format_enum_names) > int(QImage::NImageFormats))
? int(QImage::NImageFormats)
: (sizeof(qimage_format_enum_names) / sizeof(*qimage_format_enum_names));
QImage::Format formatFromString(const QString &str)
{
for (int i = 0; i < qimage_format_enum_names_count; ++i) {
if (str.compare(QLatin1String(qimage_format_enum_names[i]), Qt::CaseInsensitive) == 0) {
return (QImage::Format)(i);
}
}
return QImage::Format_Invalid;
}
QString formatToString(QImage::Format format)
{
int index = int(format);
if (index > 0 && index < qimage_format_enum_names_count) {
return QLatin1String(qimage_format_enum_names[index]);
}
return QLatin1String("<unknown:") +
QString::number(index) +
QLatin1String(">");
}

View File

@ -31,96 +31,7 @@
#include <QMetaEnum> #include <QMetaEnum>
#include <QTextStream> #include <QTextStream>
QImage::Format formatFromString(const QString &str) #include "format-enum.h"
{
if (str.compare(QLatin1String("Mono"), Qt::CaseInsensitive) == 0) {
return QImage::Format_Mono;
} else if (str.compare(QLatin1String("MonoLSB"), Qt::CaseInsensitive) == 0) {
return QImage::Format_MonoLSB;
} else if (str.compare(QLatin1String("Indexed8"), Qt::CaseInsensitive) == 0) {
return QImage::Format_Indexed8;
} else if (str.compare(QLatin1String("RGB32"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB32;
} else if (str.compare(QLatin1String("ARGB32"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB32;
} else if (str.compare(QLatin1String("ARGB32_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB32_Premultiplied;
} else if (str.compare(QLatin1String("RGB16"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB16;
} else if (str.compare(QLatin1String("ARGB8565_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB8565_Premultiplied;
} else if (str.compare(QLatin1String("RGB666"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB666;
} else if (str.compare(QLatin1String("ARGB6666_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB6666_Premultiplied;
} else if (str.compare(QLatin1String("RGB555"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB555;
} else if (str.compare(QLatin1String("ARGB8555_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB8555_Premultiplied;
} else if (str.compare(QLatin1String("RGB888"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB888;
} else if (str.compare(QLatin1String("RGB444"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGB444;
} else if (str.compare(QLatin1String("ARGB4444_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_ARGB4444_Premultiplied;
} else if (str.compare(QLatin1String("RGBX8888"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGBX8888;
} else if (str.compare(QLatin1String("RGBA8888"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGBA8888;
} else if (str.compare(QLatin1String("RGBA8888_Premultiplied"), Qt::CaseInsensitive) == 0) {
return QImage::Format_RGBA8888_Premultiplied;
} else {
return QImage::Format_Invalid;
}
}
QString formatToString(QImage::Format format)
{
switch (format) {
case QImage::Format_Invalid:
return QStringLiteral("Invalid");
case QImage::Format_Mono:
return QStringLiteral("Mono");
case QImage::Format_MonoLSB:
return QStringLiteral("MonoLSB");
case QImage::Format_Indexed8:
return QStringLiteral("Indexed8");
case QImage::Format_RGB32:
return QStringLiteral("RGB32");
case QImage::Format_ARGB32:
return QStringLiteral("ARGB32");
case QImage::Format_ARGB32_Premultiplied:
return QStringLiteral("ARGB32_Premultiplied");
case QImage::Format_RGB16:
return QStringLiteral("RGB16");
case QImage::Format_ARGB8565_Premultiplied:
return QStringLiteral("ARGB8565_Premultiplied");
case QImage::Format_RGB666:
return QStringLiteral("RGB666");
case QImage::Format_ARGB6666_Premultiplied:
return QStringLiteral("ARGB6666_Premultiplied");
case QImage::Format_RGB555:
return QStringLiteral("RGB555");
case QImage::Format_ARGB8555_Premultiplied:
return QStringLiteral("ARGB8555_Premultiplied");
case QImage::Format_RGB888:
return QStringLiteral("RGB888");
case QImage::Format_RGB444:
return QStringLiteral("RGB444");
case QImage::Format_ARGB4444_Premultiplied:
return QStringLiteral("ARGB4444_Premultiplied");
case QImage::Format_RGBX8888:
return QStringLiteral("RGBX8888");
case QImage::Format_RGBA8888:
return QStringLiteral("RGBA8888");
case QImage::Format_RGBA8888_Premultiplied:
return QStringLiteral("RGBA8888_Premultiplied");
default:
return QLatin1String("<unknown:") +
QString::number(int(format)) +
QLatin1String(">");
}
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -167,26 +78,12 @@ int main(int argc, char **argv)
return 0; return 0;
} }
if (parser.isSet(listqformats)) { if (parser.isSet(listqformats)) {
QTextStream(stdout) QTextStream out(stdout);
<< "QImage formats:\n" out << "QImage formats:\n";
<< " Mono\n" // skip QImage::Format_Invalid
<< " MonoLSB\n" for (int i = 1; i < qimage_format_enum_names_count; ++i) {
<< " Indexed8\n" out << " " << qimage_format_enum_names[i] << '\n';
<< " RGB32\n" }
<< " ARGB32\n"
<< " ARGB32_Premultiplied\n"
<< " RGB16\n"
<< " ARGB8565_Premultiplied\n"
<< " RGB666\n"
<< " ARGB6666_Premultiplied\n"
<< " RGB555\n"
<< " ARGB8555_Premultiplied\n"
<< " RGB888\n"
<< " RGB444\n"
<< " ARGB4444_Premultiplied\n"
<< " RGBX8888\n"
<< " RGBA8888\n"
<< " RGBA8888_Premultiplied\n";
return 0; return 0;
} }