Merge pull request #2131 from Exiv2/mainCleanups

Include what you use + more SPDX identifiers + few other cleanups

samples/addmoddel.cpp

@@ -1,28 +1,9 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2021 Exiv2 authors
- * This program is part of the Exiv2 distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
- */
-// addmoddel.cpp
+// SPDX-License-Identifier: GPL-2.0-or-later
 // Sample program showing how to add, modify and delete Exif metadata.
 
 #include <exiv2/exiv2.hpp>
+
 #include <iostream>
-#include <iomanip>
 #include <cassert>
 
 int main(int argc, char* const argv[])
@@ -122,9 +103,7 @@ try {
 
     // *************************************************************************
     // Finally, write the remaining Exif data to the image file
-    Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(file);
-    assert(image.get() != 0);
-
+    auto image = Exiv2::ImageFactory::open(file);
     image->setExifData(exifData);
     image->writeMetadata();