From b2597e71e57071ea2f31f42a10e5b042c4fa4c12 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 26 Oct 2022 08:42:44 +0300
Subject: [PATCH] kimgio: restore device position conditionally

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kimgio/raw.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/kimgio/raw.cpp b/kimgio/raw.cpp
index 11526fd8..643fc49d 100644
--- a/kimgio/raw.cpp
+++ b/kimgio/raw.cpp
@@ -30,7 +30,7 @@ static const char* const s_rawpluginformat = "raw";
 class RAWDataStream : public LibRaw_abstract_datastream
 {
 public:
-    RAWDataStream(QIODevice* device);
+    RAWDataStream(QIODevice* device, const bool restore);
     ~RAWDataStream();
 
     int valid() final;
@@ -48,17 +48,21 @@ public:
 private:
     QIODevice* m_device;
     const qint64 m_devicepos;
+    const bool m_restore;
 };
 
-RAWDataStream::RAWDataStream(QIODevice* device)
+RAWDataStream::RAWDataStream(QIODevice* device, const bool restore)
     : m_device(device),
-    m_devicepos(m_device->pos())
+    m_devicepos(m_device->pos()),
+    m_restore(restore)
 {
 }
 
 RAWDataStream::~RAWDataStream()
 {
-    m_device->seek(m_devicepos);
+    if (m_restore) {
+        m_device->seek(m_devicepos);
+    }
 }
 
 int RAWDataStream::valid()
@@ -184,7 +188,7 @@ bool RAWHandler::read(QImage *image)
         LibRaw raw;
         raw.imgdata.params.output_color = LIBRAW_COLORSPACE_sRGB;
 
-        RAWDataStream rawdatastream(device());
+        RAWDataStream rawdatastream(device(), false);
         int rawresult = raw.open_datastream(&rawdatastream);
         if (Q_UNLIKELY(rawresult != LIBRAW_SUCCESS)) {
             kWarning() << "Could not open datastream" << libraw_strerror(rawresult);
@@ -266,7 +270,7 @@ bool RAWHandler::canRead(QIODevice *device)
         LibRaw raw;
         raw.imgdata.params.output_color = LIBRAW_COLORSPACE_sRGB;
 
-        RAWDataStream rawdevicestream(device);
+        RAWDataStream rawdevicestream(device, true);
         const int rawresult = raw.open_datastream(&rawdevicestream);
         if (rawresult == LIBRAW_FILE_UNSUPPORTED) {
             kDebug() << libraw_strerror(rawresult);