From 79e8e183eb566453bd8b5bfcbdd27724fd1fde6a Mon Sep 17 00:00:00 2001
From: Mirco Miranda <mirco.miranda@systemceramics.com>
Date: Mon, 28 Aug 2023 18:02:02 +0000
Subject: [PATCH] ras: code revamped

- Progressive load from file
- Added support for 1-bit image
- Images with palette are now Index (instead of RGB32)
- Added options support (Size, Format)
- Added some test cases
- Improved performance by directly accessing the scanline
- Support for more RAS extension (taken from GIMP)

The code should works "as is" also on KF5.
---
 autotests/read/ras/rgb-gimp-2.10-1bit.png  | Bin 0 -> 192 bytes
 autotests/read/ras/rgb-gimp-2.10-1bit.ras  | Bin 0 -> 160 bytes
 autotests/read/ras/rgb-gimp-2.10-gray.png  | Bin 0 -> 470 bytes
 autotests/read/ras/rgb-gimp-2.10-gray.ras  | Bin 0 -> 1824 bytes
 autotests/read/ras/rgb-gimp-2.10-pal16.png | Bin 0 -> 338 bytes
 autotests/read/ras/rgb-gimp-2.10-pal16.ras | Bin 0 -> 1104 bytes
 autotests/read/ras/rgb24.png               | Bin 0 -> 7289 bytes
 autotests/read/ras/rgb24.ras               | Bin 0 -> 9692 bytes
 src/imageformats/ras.cpp                   | 302 ++++++++++++---------
 src/imageformats/ras.json                  |   4 +-
 src/imageformats/ras_p.h                   |   3 +
 11 files changed, 185 insertions(+), 124 deletions(-)
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-1bit.png
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-1bit.ras
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-gray.png
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-gray.ras
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-pal16.png
 create mode 100644 autotests/read/ras/rgb-gimp-2.10-pal16.ras
 create mode 100644 autotests/read/ras/rgb24.png
 create mode 100644 autotests/read/ras/rgb24.ras

diff --git a/autotests/read/ras/rgb-gimp-2.10-1bit.png b/autotests/read/ras/rgb-gimp-2.10-1bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f0a3ad3e907f58d918c04120e79cf476087a9d4
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T!Hle|NocXoPQU{VodUO
zcVXyYmGuB}I14-?iy0XB6G519h5hnOpdfpRr>`sfa}H59R+e{L6(xW|4xTQKAsp9}
zfAF*LcpSO^`@iJA|5|I)f9wtaXE!05S7^0+DAS{V%*C$*cW{(u=xlgnzahyW+rF!k
gWAVQQUJQ&37mdqPcV(^(2b#s;>FVdQ&MBb@04_&6%>V!Z

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb-gimp-2.10-1bit.ras b/autotests/read/ras/rgb-gimp-2.10-1bit.ras
new file mode 100644
index 0000000000000000000000000000000000000000..11cfdea844427c5a6396a43c4dff2365adf6cdd1
GIT binary patch
literal 160
zcma!CmNk`ufk6R^8G&>I5QAt;z@)&y!P?cp;`Bg)fvJUofvEwZ2E+#I0@5%xOdgpA
WsbK`E0nrXX0t#SynH^vvU>X1#`wHCv

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb-gimp-2.10-gray.png b/autotests/read/ras/rgb-gimp-2.10-gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d1dbd9f107c9d36afdd88584950959fbbf77bc6
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq001BW001Be00000RuLsA00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-~y6c;BqQ;(<&0004XNkl<ZILn2SPis?A5XH~Ty|3?Y
zV~pfqBW*!2rCA7yOZRU4gnkVdeu1VKL|h13XldHSO-Vv3`jVTxd#?*0gc35I-Q^x;
z&irP`Ll*z%9~ywSo(awqd1IBek+RH|n3(_#`1_%6q{#Ca(+f0jmap|)CH)mXQcn_s
z2JG<T!JBwJ^Rztwk{r*o=z4SzPunoQqst6#?Q{|l71OIv6fSDnDy%AE`j<f+zjaBZ
zLsLXAFK5ZC7d2a7)R<9J6rcgB^gJtssY7^jn;y0_63-yGG9<X1RUta<{jM^g%6B>D
zMnT&&9<u<-jXsQ7B5A(Qf8^UFH&RDgw)V8U0_B67g%?_^uJhsC2`#v@U&JIBf)=U`
z77PfQfmneXe=;p_@aF6LZ-rnW^LczWk;dfO^ZLX}B<ty3ZuRa8(NUHtX&1q>r-+r1
zfnsAqi398kR=Ni_>-T5Uvh2?Ry4^qs*?Wgx@G#axZq^`Fl3`na0SP;L|B0uEasU7T
M07*qoM6N<$f*Hcb>;M1&

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb-gimp-2.10-gray.ras b/autotests/read/ras/rgb-gimp-2.10-gray.ras
new file mode 100644
index 0000000000000000000000000000000000000000..faf75d7a432f9be0b404bd95cb734523d3beb7ac
GIT binary patch
literal 1824
zcma!CmNk`ufk6R^IT#pNfJ_EP2xbPdn3!2u+1NQaxwv_F`S=9{g@i>!#l$5frKDwK
z<>VC<m6TOf)zmdKwX}6~_4Ex4jf_o9&CD$<t*mWq?d%;Kot#}<-P}Dqy}W&V{rm$0
zgMvds!@?sXqoQMC<Khz%laf<X)6z3Cv$At?^YRM{i;7E1%gQS%tEy{i>*^aCo0?l%
z+uA!iySjUN`}!wLoHTjL)M?Xa%$zlQ&fIzP7c5+~c*)Xb%U7&iwR+9kb?Y~5+_ZVi
z)@|E&?A*0`&)$9e4;(yn_{h;?$4{I*b^6TNbLTHyyma}>)oa&p+`M)B&fR<WA3S{Y
z_{q~}&tJTJ_4>`*cke%Z{Pg+D*Kgl{{QUL%&)<LlNBuvt<NrV9;NS0GfBydc4NOnJ
zzkK}i@!hwd-+ui1{^Qr5e_*r!y+42M$@}+DZ$Ei*an-7Wi)Nj_y!Z6A6X)+e`~p_+
z`+WPtdv9M{zI5lxjI@FY4L#Sl&D^|a<)QN@9{dIw0F<A9^Yxp%*Y94P66_n<IQiU(
zrE3rGJbK~OL$Ey1{IicgfB*dE#nWR2aT!}4fBkg#%Ci@*UOj`D|Nrl=pTGYB!Jj{G
zW>mFa0&4p6`|n>MAL2fw0Qhp~@b*W4kp$3~KW|^T`58?NnfrZT$KJ2V0%+_HQ!A#v
zMiWEke%`Wh?K2ElAyj->mECt2kNe(rCgz<52MR(DGV8;VX_Kz~K^8$}f8DcW%NsoQ
ze?7SS06zbHzkcS%PgEn3dH+5vPhW#i|I1?U!iRY5f8AQxhR=WRW=)uO_y@9;sO)b$
z=PWpeNB;Mnt5@&g3BNy2&z*aUC;a|AI&tC=9{FDv`uZ;XLUj`|@B7w>h^^m|MNrv)
W9xPq@0FU|q|9t(5Pa4%UFb@D8ok#-!

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb-gimp-2.10-pal16.png b/autotests/read/ras/rgb-gimp-2.10-pal16.png
new file mode 100644
index 0000000000000000000000000000000000000000..968696cfeb6c1b723cb171c7d5c872192ce2954f
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Yv;_+u}}THE%qc+xxoO
zrG9qdr8)CY?EilCXmjS<);TxdR=zsE<l)pEukCNYzxV(D|Hr-!SAcps3p^r=85p>Q
zL70(Y)*K0-AbW|YuPgg=4iPa0!!P+CPXdLudb&7<Xq->}(a$Eafol)5;D3-IaykK}
z-_E@&UU_!r=4*Q_{>o{5nEU$O*}1_}o0Qe(cFx@^r(+<lao|8kWtQ)oHD42StIzGV
zJ9^;X`>VUk*WWvwE12NEx$J9|N#oql7g%ony1>%&_99EnpNlM$K3`;EIeL-B=gdWx
zsNWawZj=vwaQ|*~29xiLZ3Z6}b82KR<V>04u-%NwH{p9;N%<K!VT)>Z-v=2yvm6+!
i6sAvq+?$iaz;Nm71(78ZSA2mUVDNPHb6Mw<&;$UBl9z`7

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb-gimp-2.10-pal16.ras b/autotests/read/ras/rgb-gimp-2.10-pal16.ras
new file mode 100644
index 0000000000000000000000000000000000000000..7ceae8e943bca85a5c05099167d08804aebd65c7
GIT binary patch
literal 1104
zcmb_aJxc^J5X~l=ugN6)7yJqS0~`N<rH!q4U|}g17Kf$fRUX)gy^Yve9g3x3A%b8h
z9*3pnI)~Z4K$h6tK-ib}CNDEP*}Wc37-Ji88OCaYtcq)M|8_K+pFTgn988a|?%vv+
zz4776#q@r*c>VgAf484cH|N_&mp|jP#lvLly=~SMA@oKOt_Th2JvxU$Nh6fC02mCq
zn4uYX@2#^|axR6mmLp0c;LnnD8}((E!Xlj~9irZ7aEKu|1k!aA0zjaERRvvb^qX{t
zhrZC=IV2KCHRh&Cu2H6_3n7y19M*N6lL@1QN_IJ{s;bzZs6|mX(&VNI<E%?|84NVX
zQvbp5a{V;F%rqr9=iSg#y2r|3u>m8?4LXY6Yyi;wi~91N4;<?$l(MMnf8M92=*`vw
FegR3-S~dUx

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb24.png b/autotests/read/ras/rgb24.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b4bb197fa08b1f4b9824a12a8b44e1cdb7a3c9a
GIT binary patch
literal 7289
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
T-pZ-?00000NkvXXu0mjfuqJ;>

literal 0
HcmV?d00001

diff --git a/autotests/read/ras/rgb24.ras b/autotests/read/ras/rgb24.ras
new file mode 100644
index 0000000000000000000000000000000000000000..95438242b0180be7124291a06e4602268493076f
GIT binary patch
literal 9692
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
V1+nK-_Ck^OvPyt=<fx<x`+u$DgZBUc

literal 0
HcmV?d00001

diff --git a/src/imageformats/ras.cpp b/src/imageformats/ras.cpp
index 1a94139..91a259d 100644
--- a/src/imageformats/ras.cpp
+++ b/src/imageformats/ras.cpp
@@ -3,6 +3,7 @@
     SPDX-FileCopyrightText: 2003 Dominik Seichter <domseichter@web.de>
     SPDX-FileCopyrightText: 2004 Ignacio Castaño <castano@ludicon.com>
     SPDX-FileCopyrightText: 2010 Troy Unrau <troy@kde.org>
+    SPDX-FileCopyrightText: 2023 Mirco Miranda <mircomir@outlook.com>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
@@ -80,152 +81,161 @@ static bool IsSupported(const RasHeader &head)
         return false;
     }
     // check for an appropriate depth
-    // we support 8bit+palette, 24bit and 32bit ONLY!
-    // TODO: add support for 1bit
-    if (!((head.Depth == 8 && head.ColorMapType == 1) || head.Depth == 24 || head.Depth == 32)) {
+    if (head.Depth != 1 && head.Depth != 8 && head.Depth != 24 && head.Depth != 32) {
+        return false;
+    }
+    if (head.Width == 0 || head.Height == 0) {
         return false;
     }
     // the Type field adds support for RLE(BGR), RGB and other encodings
     // we support Type 1: Normal(BGR) and Type 3: Normal(RGB) ONLY!
     // TODO: add support for Type 2: RLE(BGR) & Type 4,5: TIFF/IFF
-    if (!(head.Type == 1 || head.Type == 3)) {
-        return false;
-    }
-    // Old files didn't have Length set - reject them for now
-    // TODO: add length recalculation to support old files
-    if (!head.Length) {
+    if (!(head.Type == RAS_TYPE_STANDARD || head.Type == RAS_TYPE_RGB_FORMAT)) {
         return false;
     }
     return true;
 }
 
+static QImage::Format imageFormat(const RasHeader &header)
+{
+    if (header.ColorMapType == RAS_COLOR_MAP_TYPE_RGB) {
+        return QImage::Format_Indexed8;
+    }
+    if (header.Depth == 8 && header.ColorMapType == RAS_COLOR_MAP_TYPE_NONE) {
+        return QImage::Format_Grayscale8;
+    }
+    if (header.Depth == 1) {
+        return QImage::Format_Mono;
+    }
+    return QImage::Format_RGB32;
+}
+
 static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
 {
     s.device()->seek(RasHeader::SIZE);
 
-    if (ras.ColorMapLength > kMaxQVectorSize) {
-        qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
+    // The width of a scan line is always a multiple of 16 bits, padded when necessary.
+    auto rasLineSize = (qint64(ras.Width) * ras.Depth + 7) / 8;
+    if (rasLineSize & 1)
+        ++rasLineSize;
+    if (rasLineSize > kMaxQVectorSize) {
+        qWarning() << "LoadRAS() unsupported line size" << rasLineSize;
         return false;
     }
 
-    // Read palette if needed.
-    QVector<quint8> palette(ras.ColorMapLength);
-    if (ras.ColorMapType == 1) {
-        for (quint32 i = 0; i < ras.ColorMapLength; ++i) {
-            s >> palette[i];
-        }
-    }
-
-    const int bpp = ras.Depth / 8;
-    if (ras.Height == 0) {
-        return false;
-    }
-    if (bpp == 0) {
-        return false;
-    }
-    if (ras.Length / ras.Height / bpp < ras.Width) {
-        qWarning() << "LoadRAS() mistmatch between height and width" << ras.Width << ras.Height << ras.Length << ras.Depth;
-        return false;
-    }
-    if (ras.Length > kMaxQVectorSize) {
-        qWarning() << "LoadRAS() unsupported image length in file header" << ras.Length;
-        return false;
-    }
-
-    // each line must be a factor of 16 bits, so they may contain padding
-    // this will be 1 if padding required, 0 otherwise
-    const int paddingrequired = (ras.Width * bpp % 2);
-
-    // qDebug() << "paddingrequired: " << paddingrequired;
-    // don't trust ras.Length
-    QVector<quint8> input(ras.Length);
-
-    int i = 0;
-    while (!s.atEnd() && i < input.size()) {
-        s >> input[i];
-        // I guess we need to find out if we're at the end of a line
-        if (paddingrequired && i != 0 && !(i % (ras.Width * bpp))) {
-            s >> input[i];
-        }
-        i++;
-    }
-
     // Allocate image
-    img = imageAlloc(ras.Width, ras.Height, QImage::Format_ARGB32);
+    img = imageAlloc(ras.Width, ras.Height, imageFormat(ras));
     if (img.isNull()) {
         return false;
     }
 
-    // Reconstruct image from RGB palette if we have a palette
-    // TODO: make generic so it works with 24bit or 32bit palettes
-    if (ras.ColorMapType == 1 && ras.Depth == 8) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = palette.value((int)input[y * ras.Width + x]);
-                green = palette.value((int)input[y * ras.Width + x] + (ras.ColorMapLength / 3));
-                blue = palette.value((int)input[y * ras.Width + x] + 2 * (ras.ColorMapLength / 3));
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+    // Read palette if needed.
+    if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_RGB) {
+        QVector<quint8> palette(ras.ColorMapLength);
+        for (quint32 i = 0; i < ras.ColorMapLength; ++i) {
+            s >> palette[i];
+        }
+        QList<QRgb> colorTable;
+        for (quint32 i = 0, n = ras.ColorMapLength / 3; i < n; ++i) {
+            colorTable << qRgb(palette.at(i), palette.at(i + n), palette.at(i + 2 * n));
+        }
+        for (; colorTable.size() < 256;) {
+            colorTable << qRgb(255, 255, 255);
+        }
+        img.setColorTable(colorTable);
+        if (s.status() != QDataStream::Ok) {
+            return false;
         }
     }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 24 && (ras.Type == 1 || ras.Type == 2)) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 3 * ras.Width + x * 3 + 2];
-                green = input[y * 3 * ras.Width + x * 3 + 1];
-                blue = input[y * 3 * ras.Width + x * 3];
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+    QByteArray rasLine(rasLineSize, 0);
+    auto bytesPerLine = std::min(img.bytesPerLine(), rasLine.size());
+    for (quint32 y = 0; y < ras.Height; ++y) {
+        auto read = s.readRawData(rasLine.data(), rasLine.size());
+        if (read != rasLine.size()) {
+            qWarning() << "LoadRAS() unable to read line" << y << ": the seems corrupted!";
+            return false;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 24 && ras.Type == 3) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 3 * ras.Width + x * 3];
-                green = input[y * 3 * ras.Width + x * 3 + 1];
-                blue = input[y * 3 * ras.Width + x * 3 + 2];
-                img.setPixel(x, y, qRgb(red, green, blue));
+        // Grayscale 1-bit / Grayscale 8-bit (never seen)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && (ras.Depth == 1 || ras.Depth == 8)) {
+            for (auto &&b : rasLine) {
+                b = ~b;
             }
+            std::memcpy(img.scanLine(y), rasLine.constData(), bytesPerLine);
+            continue;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 32 && (ras.Type == 1 || ras.Type == 2)) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 4 * ras.Width + x * 4 + 3];
-                green = input[y * 4 * ras.Width + x * 4 + 2];
-                blue = input[y * 4 * ras.Width + x * 4 + 1];
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+        // Image with palette
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_RGB && (ras.Depth == 1 || ras.Depth == 8)) {
+            std::memcpy(img.scanLine(y), rasLine.constData(), bytesPerLine);
+            continue;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 32 && ras.Type == 3) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
+        // BGR 24-bit
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 24 && (ras.Type == RAS_TYPE_STANDARD || ras.Type == RAS_TYPE_BYTE_ENCODED)) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
             for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 4 * ras.Width + x * 4 + 1];
-                green = input[y * 4 * ras.Width + x * 4 + 2];
-                blue = input[y * 4 * ras.Width + x * 4 + 3];
-                img.setPixel(x, y, qRgb(red, green, blue));
+                red = rasLine.at(x * 3 + 2);
+                green = rasLine.at(x * 3 + 1);
+                blue = rasLine.at(x * 3);
+                *(scanLine + x) = qRgb(red, green, blue);
             }
+            continue;
         }
+
+        // RGB 24-bit
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 24 && ras.Type == RAS_TYPE_RGB_FORMAT) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 3);
+                green = rasLine.at(x * 3 + 1);
+                blue = rasLine.at(x * 3 + 2);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+            continue;
+        }
+
+        // BGR 32-bit (not tested: test case missing)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 32 && (ras.Type == RAS_TYPE_STANDARD || ras.Type == RAS_TYPE_BYTE_ENCODED)) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 4 + 3);
+                green = rasLine.at(x * 4 + 2);
+                blue = rasLine.at(x * 4 + 1);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+
+            continue;
+        }
+
+        // RGB 32-bit (tested: test case missing due to image too large)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 32 && ras.Type == RAS_TYPE_RGB_FORMAT) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 4 + 1);
+                green = rasLine.at(x * 4 + 2);
+                blue = rasLine.at(x * 4 + 3);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+            continue;
+        }
+
+        qWarning() << "LoadRAS() unsupported format!"
+                   << "ColorMapType:" << ras.ColorMapType << "Type:" << ras.Type << "Depth:" << ras.Depth;
+        return false;
     }
 
     return true;
@@ -283,16 +293,8 @@ bool RASHandler::read(QImage *outImage)
     RasHeader ras;
     s >> ras;
 
-    if (ras.ColorMapLength > std::numeric_limits<int>::max()) {
-        return false;
-    }
-
-    // TODO: add support for old versions of RAS where Length may be zero in header
-    s.device()->seek(RasHeader::SIZE + ras.Length + ras.ColorMapLength);
-
-    // Check image file format. Type 2 is RLE, which causing seeking to be silly.
-    if (!s.atEnd() && ras.Type != 2) {
-        //         qDebug() << "This RAS file is not valid, or an older version of the format.";
+    if (ras.ColorMapLength > kMaxQVectorSize) {
+        qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
         return false;
     }
 
@@ -314,9 +316,65 @@ bool RASHandler::read(QImage *outImage)
     return true;
 }
 
+bool RASHandler::supportsOption(ImageOption option) const
+{
+    if (option == QImageIOHandler::Size) {
+        return true;
+    }
+    if (option == QImageIOHandler::ImageFormat) {
+        return true;
+    }
+    return false;
+}
+
+QVariant RASHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+    if (option == QImageIOHandler::Size) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto ba = d->read(RasHeader::SIZE);
+            d->rollbackTransaction();
+
+            QDataStream s(ba);
+            s.setByteOrder(QDataStream::BigEndian);
+
+            RasHeader header;
+            s >> header;
+
+            if (s.status() == QDataStream::Ok && IsSupported(header)) {
+                v = QVariant::fromValue(QSize(header.Width, header.Height));
+            }
+        }
+    }
+
+    if (option == QImageIOHandler::ImageFormat) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto ba = d->read(RasHeader::SIZE);
+            d->rollbackTransaction();
+
+            QDataStream s(ba);
+            s.setByteOrder(QDataStream::BigEndian);
+
+            RasHeader header;
+            s >> header;
+
+            if (s.status() == QDataStream::Ok && IsSupported(header)) {
+                v = QVariant::fromValue(imageFormat(header));
+            }
+        }
+    }
+
+    return v;
+}
+
 QImageIOPlugin::Capabilities RASPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
-    if (format == "ras") {
+    if (format == "im1" || format == "im8" || format == "im24" || format == "im32" || format == "ras" || format == "sun") {
         return Capabilities(CanRead);
     }
     if (!format.isEmpty()) {
diff --git a/src/imageformats/ras.json b/src/imageformats/ras.json
index 31a9f6a..1d58077 100644
--- a/src/imageformats/ras.json
+++ b/src/imageformats/ras.json
@@ -1,4 +1,4 @@
 {
-    "Keys": [ "ras" ],
-    "MimeTypes": [ "image/x-sun-raster" ]
+    "Keys": [ "im1", "im8", "im24", "im32", "ras", "sun" ],
+    "MimeTypes": [ "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster" ]
 }
diff --git a/src/imageformats/ras_p.h b/src/imageformats/ras_p.h
index 044e1e8..99a82a0 100644
--- a/src/imageformats/ras_p.h
+++ b/src/imageformats/ras_p.h
@@ -19,6 +19,9 @@ public:
     bool canRead() const override;
     bool read(QImage *image) override;
 
+    bool supportsOption(QImageIOHandler::ImageOption option) const override;
+    QVariant option(QImageIOHandler::ImageOption option) const override;
+
     static bool canRead(QIODevice *device);
 };