return nullptr instead of reset

Signed-off-by: Rosen Penev <rosenp@gmail.com>

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }
 

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
+}  // namespace Exiv2

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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
+}  // namespace Exiv2

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }