From 842ef05ee60bff765c0402a211971aed53b728cc Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 4 Jan 2023 15:21:39 -0800
Subject: [PATCH] return nullptr instead of reset

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/asfvideo.cpp       | 2 +-
 src/bmffimage.cpp      | 2 +-
 src/bmpimage.cpp       | 2 +-
 src/cr2image.cpp       | 2 +-
 src/crwimage.cpp       | 2 +-
 src/epsimage.cpp       | 2 +-
 src/gifimage.cpp       | 2 +-
 src/jp2image.cpp       | 2 +-
 src/jpgimage.cpp       | 4 ++--
 src/matroskavideo.cpp  | 4 ++--
 src/mrwimage.cpp       | 2 +-
 src/orfimage.cpp       | 2 +-
 src/pgfimage.cpp       | 2 +-
 src/pngimage.cpp       | 2 +-
 src/preview.cpp        | 2 +-
 src/psdimage.cpp       | 2 +-
 src/quicktimevideo.cpp | 4 ++--
 src/rafimage.cpp       | 2 +-
 src/riffvideo.cpp      | 2 +-
 src/rw2image.cpp       | 2 +-
 src/tgaimage.cpp       | 2 +-
 src/tiffimage.cpp      | 2 +-
 src/webpimage.cpp      | 2 +-
 src/xmpsidecar.cpp     | 2 +-
 24 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index 44860b72..0ddabeb4 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -689,7 +689,7 @@ void AsfVideo::aspectRatio() {
 Image::UniquePtr newAsfInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<AsfVideo>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 84844fab..636a6e3d 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -766,7 +766,7 @@ void BmffImage::writeMetadata() {
 Image::UniquePtr newBmffInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<BmffImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp
index 8fd13929..c6001c7b 100644
--- a/src/bmpimage.cpp
+++ b/src/bmpimage.cpp
@@ -92,7 +92,7 @@ void BmpImage::writeMetadata() {
 Image::UniquePtr newBmpInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<BmpImage>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 9796c132..694f7f33 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -131,7 +131,7 @@ WriteMethod Cr2Parser::encode(BasicIo& io, const byte* pData, size_t size, ByteO
 Image::UniquePtr newCr2Instance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<Cr2Image>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 5429846d..9460b27b 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -131,7 +131,7 @@ void CrwParser::encode(Blob& blob, const byte* pData, size_t size, const CrwImag
 Image::UniquePtr newCrwInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<CrwImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 96716f59..9189de1d 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -1131,7 +1131,7 @@ void EpsImage::writeMetadata() {
 Image::UniquePtr newEpsInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<EpsImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/gifimage.cpp b/src/gifimage.cpp
index f9a9cbae..6fe5ad7f 100644
--- a/src/gifimage.cpp
+++ b/src/gifimage.cpp
@@ -67,7 +67,7 @@ void GifImage::writeMetadata() {
 Image::UniquePtr newGifInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<GifImage>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index dc8d89db..2fb76a8f 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -877,7 +877,7 @@ void Jp2Image::doWriteMetadata(BasicIo& outIo) {
 Image::UniquePtr newJp2Instance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<Jp2Image>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 5f8d0e0e..5152e3f7 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -966,7 +966,7 @@ bool JpegImage::isThisType(BasicIo& iIo, bool advance) const {
 Image::UniquePtr newJpegInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<JpegImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
@@ -1014,7 +1014,7 @@ bool ExvImage::isThisType(BasicIo& iIo, bool advance) const {
 Image::UniquePtr newExvInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<ExvImage>(std::move(io), create);
   if (!image->good())
-    image.reset();
+    return nullptr;
   return image;
 }
 
diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
index da2960a1..5caf17e5 100644
--- a/src/matroskavideo.cpp
+++ b/src/matroskavideo.cpp
@@ -947,7 +947,7 @@ uint32_t MatroskaVideo::findBlockSize(byte b) {
 Image::UniquePtr newMkvInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<MatroskaVideo>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
@@ -969,4 +969,4 @@ bool isMkvType(BasicIo& iIo, bool advance) {
   return result;
 }
 
-}  // namespace Exiv2
\ No newline at end of file
+}  // namespace Exiv2
diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp
index da73d6dc..5dd320d6 100644
--- a/src/mrwimage.cpp
+++ b/src/mrwimage.cpp
@@ -120,7 +120,7 @@ void MrwImage::writeMetadata() {
 Image::UniquePtr newMrwInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<MrwImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/orfimage.cpp b/src/orfimage.cpp
index d812310a..86dd5de1 100644
--- a/src/orfimage.cpp
+++ b/src/orfimage.cpp
@@ -142,7 +142,7 @@ WriteMethod OrfParser::encode(BasicIo& io, const byte* pData, size_t size, ByteO
 Image::UniquePtr newOrfInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<OrfImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp
index 4ea8a292..fa8ef588 100644
--- a/src/pgfimage.cpp
+++ b/src/pgfimage.cpp
@@ -288,7 +288,7 @@ DataBuf PgfImage::readPgfHeaderStructure(BasicIo& iIo, uint32_t& width, uint32_t
 Image::UniquePtr newPgfInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<PgfImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index f95fc719..fc96a5b0 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -686,7 +686,7 @@ void PngImage::doWriteMetadata(BasicIo& outIo) {
 Image::UniquePtr newPngInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<PngImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/preview.cpp b/src/preview.cpp
index be4b05bf..ad5c8012 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -334,7 +334,7 @@ Loader::UniquePtr Loader::create(PreviewId id, const Image& image) {
   auto loader = loaderList_[id].create_(id, image, loaderList_[id].parIdx_);
 
   if (loader && !loader->valid())
-    loader.reset();
+    return nullptr;
 
   return loader;
 }
diff --git a/src/psdimage.cpp b/src/psdimage.cpp
index 0e931ac1..04cffd81 100644
--- a/src/psdimage.cpp
+++ b/src/psdimage.cpp
@@ -678,7 +678,7 @@ uint32_t PsdImage::writeXmpData(const XmpData& xmpData, BasicIo& out) const {
 Image::UniquePtr newPsdInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<PsdImage>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index 3eb17a04..850fe58d 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -1576,7 +1576,7 @@ void QuickTimeVideo::aspectRatio() {
 Image::UniquePtr newQTimeInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<QuickTimeVideo>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
@@ -1613,4 +1613,4 @@ bool isQTimeType(BasicIo& iIo, bool advance) {
   return matched;
 }
 
-}  // namespace Exiv2
\ No newline at end of file
+}  // namespace Exiv2
diff --git a/src/rafimage.cpp b/src/rafimage.cpp
index f7d5a371..ec0994a4 100644
--- a/src/rafimage.cpp
+++ b/src/rafimage.cpp
@@ -317,7 +317,7 @@ void RafImage::writeMetadata() {
 Image::UniquePtr newRafInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<RafImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp
index 06342287..f4f7e6a1 100644
--- a/src/riffvideo.cpp
+++ b/src/riffvideo.cpp
@@ -1232,7 +1232,7 @@ void RiffVideo::fillDuration(double frame_rate, size_t frame_count) {
 Image::UniquePtr newRiffInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<RiffVideo>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/rw2image.cpp b/src/rw2image.cpp
index 696fcf99..f232112f 100644
--- a/src/rw2image.cpp
+++ b/src/rw2image.cpp
@@ -197,7 +197,7 @@ ByteOrder Rw2Parser::decode(ExifData& exifData, IptcData& iptcData, XmpData& xmp
 Image::UniquePtr newRw2Instance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<Rw2Image>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/tgaimage.cpp b/src/tgaimage.cpp
index 5cde039e..3954bdc7 100644
--- a/src/tgaimage.cpp
+++ b/src/tgaimage.cpp
@@ -91,7 +91,7 @@ void TgaImage::writeMetadata() {
 Image::UniquePtr newTgaInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<TgaImage>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 24c44aed..1dca602a 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -236,7 +236,7 @@ WriteMethod TiffParser::encode(BasicIo& io, const byte* pData, size_t size, Byte
 Image::UniquePtr newTiffInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<TiffImage>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 861963da..eb435e6b 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -682,7 +682,7 @@ void WebPImage::decodeChunks(uint32_t filesize) {
 Image::UniquePtr newWebPInstance(BasicIo::UniquePtr io, bool /*create*/) {
   auto image = std::make_unique<WebPImage>(std::move(io));
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index 64af61a8..56b2133b 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -148,7 +148,7 @@ void XmpSidecar::writeMetadata() {
 Image::UniquePtr newXmpInstance(BasicIo::UniquePtr io, bool create) {
   auto image = std::make_unique<XmpSidecar>(std::move(io), create);
   if (!image->good()) {
-    image.reset();
+    return nullptr;
   }
   return image;
 }