From 1e4cb5d34032a97a61a2cea49a77fc113c501966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Wed, 2 Mar 2022 17:46:49 +0100 Subject: [PATCH 1/5] Use SPDX identifier in header files --- include/exiv2/basicio.hpp | 24 ++---------------------- include/exiv2/bmffimage.hpp | 20 +------------------- include/exiv2/bmpimage.hpp | 23 ++--------------------- include/exiv2/convert.hpp | 21 ++------------------- include/exiv2/cr2image.hpp | 23 ++--------------------- include/exiv2/crwimage.hpp | 22 ++-------------------- include/exiv2/datasets.hpp | 21 +-------------------- include/exiv2/epsimage.hpp | 21 ++------------------- include/exiv2/error.hpp | 21 ++------------------- include/exiv2/exif.hpp | 21 ++------------------- include/exiv2/exiv2.hpp | 21 ++------------------- include/exiv2/futils.hpp | 21 ++------------------- include/exiv2/gifimage.hpp | 21 ++------------------- include/exiv2/http.hpp | 20 +------------------- include/exiv2/image.hpp | 21 ++------------------- include/exiv2/image_types.hpp | 20 +------------------- include/exiv2/ini.hpp | 30 +----------------------------- include/exiv2/iptc.hpp | 21 ++------------------- include/exiv2/jp2image.hpp | 24 +----------------------- include/exiv2/jpgimage.hpp | 22 ++-------------------- include/exiv2/metadatum.hpp | 21 ++------------------- include/exiv2/mrwimage.hpp | 21 ++------------------- include/exiv2/orfimage.hpp | 21 ++------------------- include/exiv2/pgfimage.hpp | 21 ++------------------- include/exiv2/pngimage.hpp | 21 ++------------------- include/exiv2/preview.hpp | 21 ++------------------- include/exiv2/properties.hpp | 21 ++------------------- include/exiv2/psdimage.hpp | 21 ++------------------- include/exiv2/rafimage.hpp | 21 ++------------------- include/exiv2/rw2image.hpp | 21 ++------------------- include/exiv2/slice.hpp | 20 +------------------- include/exiv2/tags.hpp | 21 ++------------------- include/exiv2/tgaimage.hpp | 20 +------------------- include/exiv2/tiffimage.hpp | 20 +------------------- include/exiv2/types.hpp | 21 ++------------------- include/exiv2/value.hpp | 21 ++------------------- include/exiv2/version.hpp | 21 ++------------------- include/exiv2/webpimage.hpp | 21 ++------------------- include/exiv2/xmp_exiv2.hpp | 21 ++------------------- include/exiv2/xmpsidecar.hpp | 21 ++------------------- 40 files changed, 71 insertions(+), 784 deletions(-) diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp index c456344d89..ce01b346de 100644 --- a/include/exiv2/basicio.hpp +++ b/include/exiv2/basicio.hpp @@ -1,25 +1,5 @@ -// ***************************************************************** -*- 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. - */ -/* - File: basicio.hpp - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef BASICIO_HPP_ #define BASICIO_HPP_ diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp index abed178e82..0e21dff4f8 100644 --- a/include/exiv2/bmffimage.hpp +++ b/include/exiv2/bmffimage.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- C++ -*- -/* - * Copyright (C) 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/include/exiv2/bmpimage.hpp b/include/exiv2/bmpimage.hpp index 4966ad9e04..36b9d9b354 100644 --- a/include/exiv2/bmpimage.hpp +++ b/include/exiv2/bmpimage.hpp @@ -1,25 +1,6 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! - @file bmpimage.hpp - @brief Windows Bitmap (BMP) image @author Marco Piovanelli, Ovolab (marco) marco.piovanelli@pobox.com @date 05-Mar-2007, marco: created diff --git a/include/exiv2/convert.hpp b/include/exiv2/convert.hpp index e77aec4174..cd9fab344c 100644 --- a/include/exiv2/convert.hpp +++ b/include/exiv2/convert.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file convert.hpp @brief Exif and IPTC conversions to and from XMP diff --git a/include/exiv2/cr2image.hpp b/include/exiv2/cr2image.hpp index f8f7990c0b..16399d0a96 100644 --- a/include/exiv2/cr2image.hpp +++ b/include/exiv2/cr2image.hpp @@ -1,25 +1,6 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! - @file cr2image.hpp - @brief Class Cr2Image @author Andreas Huggel (ahu) ahuggel@gmx.net @date 22-Apr-06, ahu: created diff --git a/include/exiv2/crwimage.hpp b/include/exiv2/crwimage.hpp index 991ce1e432..aa15c10280 100644 --- a/include/exiv2/crwimage.hpp +++ b/include/exiv2/crwimage.hpp @@ -1,24 +1,6 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! - @file crwimage.hpp @brief Class CrwImage to access Canon CRW images.
References:
The Canon RAW (CRW) File Format by Phil Harvey diff --git a/include/exiv2/datasets.hpp b/include/exiv2/datasets.hpp index 1a63ac1d71..0d5be0d996 100644 --- a/include/exiv2/datasets.hpp +++ b/include/exiv2/datasets.hpp @@ -1,24 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /*! - @file datasets.hpp @brief IPTC dataset and type information @author Brad Schick (brad) @date 24-Jul-04, brad: created diff --git a/include/exiv2/epsimage.hpp b/include/exiv2/epsimage.hpp index ca4c498d78..36b3d5c1b2 100644 --- a/include/exiv2/epsimage.hpp +++ b/include/exiv2/epsimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file epsimage.hpp @brief EPS image. diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp index 8d0f1e56ca..5776f2ce3f 100644 --- a/include/exiv2/error.hpp +++ b/include/exiv2/error.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file error.hpp @brief Error class for exceptions, log message class diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp index 6feb92d42d..5116d0e471 100644 --- a/include/exiv2/exif.hpp +++ b/include/exiv2/exif.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file exif.hpp @brief Encoding and decoding of Exif data diff --git a/include/exiv2/exiv2.hpp b/include/exiv2/exiv2.hpp index 796e22cfc3..583af9bf89 100644 --- a/include/exiv2/exiv2.hpp +++ b/include/exiv2/exiv2.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef EXIV2_HPP_ #define EXIV2_HPP_ diff --git a/include/exiv2/futils.hpp b/include/exiv2/futils.hpp index ced26270e1..743a51c848 100644 --- a/include/exiv2/futils.hpp +++ b/include/exiv2/futils.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef FUTILS_HPP_ #define FUTILS_HPP_ diff --git a/include/exiv2/gifimage.hpp b/include/exiv2/gifimage.hpp index 4f1f3d854b..5beb6f122e 100644 --- a/include/exiv2/gifimage.hpp +++ b/include/exiv2/gifimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef GIFIMAGE_HPP_ #define GIFIMAGE_HPP_ diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp index 9d46a703fb..800378bcfc 100644 --- a/include/exiv2/http.hpp +++ b/include/exiv2/http.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef HTTP_HPP_ #define HTTP_HPP_ diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp index 36adf69edb..b08f53ce0c 100644 --- a/include/exiv2/image.hpp +++ b/include/exiv2/image.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef IMAGE_HPP_ #define IMAGE_HPP_ diff --git a/include/exiv2/image_types.hpp b/include/exiv2/image_types.hpp index afa438083d..2c22ac5553 100644 --- a/include/exiv2/image_types.hpp +++ b/include/exiv2/image_types.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- C++ -*- -/* - * Copyright (C) 2004-2019 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef IMAGE_TYPES_H #define IMAGE_TYPES_H diff --git a/include/exiv2/ini.hpp b/include/exiv2/ini.hpp index bd71717766..fd6be9ee82 100755 --- a/include/exiv2/ini.hpp +++ b/include/exiv2/ini.hpp @@ -1,25 +1,6 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: BSD-3-Clause // Read an INI file into easy-to-access name/value pairs. - // inih and INIReader are released under the New BSD license (see LICENSE.txt). // Go to the project home page for more info: // @@ -35,15 +16,6 @@ namespace Exiv2 { -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -https://github.com/benhoyt/inih - -*/ - #ifndef __INI_H__ #define __INI_H__ diff --git a/include/exiv2/iptc.hpp b/include/exiv2/iptc.hpp index 4ea0d03de0..c981751479 100644 --- a/include/exiv2/iptc.hpp +++ b/include/exiv2/iptc.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file iptc.hpp @brief Encoding and decoding of IPTC data diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp index 2a0604db43..d484e94967 100644 --- a/include/exiv2/jp2image.hpp +++ b/include/exiv2/jp2image.hpp @@ -1,26 +1,4 @@ -// ***************************************************************** -*- 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. - */ - -/* - File: jp2image.cpp -*/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef JP2IMAGE_HPP_ #define JP2IMAGE_HPP_ diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp index 9d038a9a85..ae74be3acc 100644 --- a/include/exiv2/jpgimage.hpp +++ b/include/exiv2/jpgimage.hpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ - +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef JPGIMAGE_HPP_ #define JPGIMAGE_HPP_ diff --git a/include/exiv2/metadatum.hpp b/include/exiv2/metadatum.hpp index 53efd85a18..1bf8af70c3 100644 --- a/include/exiv2/metadatum.hpp +++ b/include/exiv2/metadatum.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef METADATUM_HPP_ #define METADATUM_HPP_ diff --git a/include/exiv2/mrwimage.hpp b/include/exiv2/mrwimage.hpp index 0956963f79..faefd38efd 100644 --- a/include/exiv2/mrwimage.hpp +++ b/include/exiv2/mrwimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef MRWIMAGE_HPP_ #define MRWIMAGE_HPP_ diff --git a/include/exiv2/orfimage.hpp b/include/exiv2/orfimage.hpp index 956e665b2d..906ce38999 100644 --- a/include/exiv2/orfimage.hpp +++ b/include/exiv2/orfimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef ORFIMAGE_HPP_ #define ORFIMAGE_HPP_ diff --git a/include/exiv2/pgfimage.hpp b/include/exiv2/pgfimage.hpp index ed05558aec..3869062e45 100644 --- a/include/exiv2/pgfimage.hpp +++ b/include/exiv2/pgfimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PGFIMAGE_HPP_ #define PGFIMAGE_HPP_ diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp index a002ba3c53..8f73281cd7 100644 --- a/include/exiv2/pngimage.hpp +++ b/include/exiv2/pngimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PNGIMAGE_HPP_ #define PNGIMAGE_HPP_ diff --git a/include/exiv2/preview.hpp b/include/exiv2/preview.hpp index 6d5228d1dc..dd0e410841 100644 --- a/include/exiv2/preview.hpp +++ b/include/exiv2/preview.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PREVIEW_HPP_ #define PREVIEW_HPP_ diff --git a/include/exiv2/properties.hpp b/include/exiv2/properties.hpp index cc45babb7f..05d011b7cc 100644 --- a/include/exiv2/properties.hpp +++ b/include/exiv2/properties.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PROPERTIES_HPP_ #define PROPERTIES_HPP_ diff --git a/include/exiv2/psdimage.hpp b/include/exiv2/psdimage.hpp index 2863cfdc7f..e3ec827a9b 100644 --- a/include/exiv2/psdimage.hpp +++ b/include/exiv2/psdimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PSDIMAGE_HPP_ #define PSDIMAGE_HPP_ diff --git a/include/exiv2/rafimage.hpp b/include/exiv2/rafimage.hpp index 9c651c0057..febd36fa03 100644 --- a/include/exiv2/rafimage.hpp +++ b/include/exiv2/rafimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef RAFIMAGE_HPP_ #define RAFIMAGE_HPP_ diff --git a/include/exiv2/rw2image.hpp b/include/exiv2/rw2image.hpp index 34ecd7fb61..d6e25c51e8 100644 --- a/include/exiv2/rw2image.hpp +++ b/include/exiv2/rw2image.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef RW2IMAGE_HPP_ #define RW2IMAGE_HPP_ diff --git a/include/exiv2/slice.hpp b/include/exiv2/slice.hpp index 6b247ce1f5..c533d23140 100644 --- a/include/exiv2/slice.hpp +++ b/include/exiv2/slice.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef EXIV2_INCLUDE_SLICE_HPP #define EXIV2_INCLUDE_SLICE_HPP diff --git a/include/exiv2/tags.hpp b/include/exiv2/tags.hpp index 3670da1774..a0075ee5b6 100644 --- a/include/exiv2/tags.hpp +++ b/include/exiv2/tags.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TAGS_HPP_ #define TAGS_HPP_ diff --git a/include/exiv2/tgaimage.hpp b/include/exiv2/tgaimage.hpp index 12d87fe32d..fd3b7f13cb 100644 --- a/include/exiv2/tgaimage.hpp +++ b/include/exiv2/tgaimage.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef TGAIMAGE_HPP_ #define TGAIMAGE_HPP_ diff --git a/include/exiv2/tiffimage.hpp b/include/exiv2/tiffimage.hpp index c234435479..bb1b9db181 100644 --- a/include/exiv2/tiffimage.hpp +++ b/include/exiv2/tiffimage.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef TIFFIMAGE_HPP_ #define TIFFIMAGE_HPP_ diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp index c3182f6697..92dc08d97d 100644 --- a/include/exiv2/types.hpp +++ b/include/exiv2/types.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TYPES_HPP_ #define TYPES_HPP_ diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp index e75fedc0c4..1ead43bdd7 100644 --- a/include/exiv2/value.hpp +++ b/include/exiv2/value.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef VALUE_HPP_ #define VALUE_HPP_ diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp index 4daeca92e3..42a38cf2d6 100644 --- a/include/exiv2/version.hpp +++ b/include/exiv2/version.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef VERSION_HPP_ #define VERSION_HPP_ diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp index 1eb8f65345..dc12c0152f 100644 --- a/include/exiv2/webpimage.hpp +++ b/include/exiv2/webpimage.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef WEBPIMAGE_HPP #define WEBPIMAGE_HPP diff --git a/include/exiv2/xmp_exiv2.hpp b/include/exiv2/xmp_exiv2.hpp index 85250a1419..e48ba07584 100644 --- a/include/exiv2/xmp_exiv2.hpp +++ b/include/exiv2/xmp_exiv2.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef XMP_HPP_ #define XMP_HPP_ diff --git a/include/exiv2/xmpsidecar.hpp b/include/exiv2/xmpsidecar.hpp index a6f6b119d0..642c158d86 100644 --- a/include/exiv2/xmpsidecar.hpp +++ b/include/exiv2/xmpsidecar.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef XMPSIDECAR_HPP_ #define XMPSIDECAR_HPP_ From 1c015e382083697171663fa944d97305e6a40996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 3 Mar 2022 19:23:27 +0100 Subject: [PATCH 2/5] Use SPDX identifier in rest of source files --- app/actions.cpp | 25 ++--------------------- app/actions.hpp | 21 ++----------------- app/exiv2.cpp | 20 +------------------ app/getopt.cpp | 20 +------------------ app/wmain.c | 2 ++ include/exiv2/ini.hpp | 1 + src/basicio.cpp | 25 ++--------------------- src/bmffimage.cpp | 24 +--------------------- src/bmpimage.cpp | 21 +------------------ src/canonmn_int.cpp | 21 +------------------ src/canonmn_int.hpp | 20 +------------------ src/casiomn_int.cpp | 21 +------------------ src/casiomn_int.hpp | 21 ++----------------- src/convert.cpp | 20 +------------------ src/cr2header_int.cpp | 2 ++ src/cr2header_int.hpp | 21 ++----------------- src/cr2image.cpp | 25 ++--------------------- src/crwimage.cpp | 22 +------------------- src/crwimage_int.cpp | 20 +------------------ src/crwimage_int.hpp | 21 ++----------------- src/datasets.cpp | 21 +------------------ src/easyaccess.cpp | 24 +--------------------- src/epsimage.cpp | 23 ++------------------- src/error.cpp | 26 ++---------------------- src/exif.cpp | 21 ++----------------- src/fujimn_int.cpp | 21 +------------------ src/fujimn_int.hpp | 20 +------------------ src/futils.cpp | 31 ++--------------------------- src/gifimage.cpp | 29 ++------------------------- src/helper_functions.cpp | 20 +------------------ src/helper_functions.hpp | 21 ++----------------- src/http.cpp | 20 +------------------ src/image.cpp | 22 ++------------------ src/image_int.cpp | 20 +------------------ src/image_int.hpp | 21 ++----------------- src/ini.cpp | 30 ++-------------------------- src/iptc.cpp | 22 ++------------------ src/jp2image.cpp | 22 +------------------- src/jpgimage.cpp | 22 ++------------------ src/makernote_int.cpp | 21 +------------------ src/makernote_int.hpp | 21 ++----------------- src/metadatum.cpp | 22 ++------------------ src/minoltamn_int.cpp | 21 +------------------ src/minoltamn_int.hpp | 21 ++----------------- src/mrwimage.cpp | 22 ++------------------ src/nikonmn_int.cpp | 25 ++--------------------- src/nikonmn_int.hpp | 21 ++----------------- src/olympusmn_int.cpp | 20 +------------------ src/olympusmn_int.hpp | 20 +------------------ src/orfimage.cpp | 22 ++------------------ src/orfimage_int.cpp | 20 +------------------ src/orfimage_int.hpp | 21 ++----------------- src/panasonicmn_int.cpp | 22 ++------------------ src/panasonicmn_int.hpp | 21 ++----------------- src/pentaxmn_int.cpp | 22 ++------------------ src/pentaxmn_int.hpp | 21 ++----------------- src/pgfimage.cpp | 22 ++------------------ src/pngchunk_int.cpp | 22 ++------------------ src/pngchunk_int.hpp | 21 ++----------------- src/pngimage.cpp | 22 ++------------------ src/preview.cpp | 22 ++------------------ src/properties.cpp | 22 ++------------------ src/psdimage.cpp | 22 ++------------------ src/rafimage.cpp | 22 ++------------------ src/rw2image.cpp | 22 ++------------------ src/rw2image_int.cpp | 20 +------------------ src/rw2image_int.hpp | 21 ++----------------- src/safe_op.hpp | 20 +------------------ src/samsungmn_int.cpp | 22 ++------------------ src/samsungmn_int.hpp | 21 ++----------------- src/sigmamn_int.cpp | 22 ++------------------ src/sigmamn_int.hpp | 21 ++----------------- src/sonymn_int.cpp | 22 ++------------------ src/sonymn_int.hpp | 21 ++----------------- src/tags.cpp | 22 ++------------------ src/tags_int.cpp | 21 +------------------ src/tags_int.hpp | 21 ++----------------- src/tgaimage.cpp | 22 ++------------------ src/tiffcomposite_int.cpp | 21 +------------------ src/tiffcomposite_int.hpp | 21 ++----------------- src/tifffwd_int.hpp | 21 ++----------------- src/tiffimage.cpp | 22 ++------------------ src/tiffimage_int.cpp | 20 +------------------ src/tiffimage_int.hpp | 21 ++----------------- src/tiffvisitor_int.cpp | 22 ++------------------ src/tiffvisitor_int.hpp | 21 ++----------------- src/types.cpp | 22 ++------------------ src/unused.h | 19 +----------------- src/value.cpp | 22 ++------------------ src/version.cpp | 21 +------------------ src/webpimage.cpp | 22 ++------------------ src/xmp.cpp | 22 ++------------------ src/xmpsidecar.cpp | 22 +------------------- unitTests/mainTestRunner.cpp | 20 +------------------ unitTests/test_DateValue.cpp | 20 +------------------ unitTests/test_FileIo.cpp | 20 +------------------ unitTests/test_ImageFactory.cpp | 2 ++ unitTests/test_IptcKey.cpp | 2 ++ unitTests/test_LangAltValueRead.cpp | 20 +------------------ unitTests/test_TimeValue.cpp | 20 +------------------ unitTests/test_XmpKey.cpp | 20 +------------------ unitTests/test_basicio.cpp | 20 +------------------ unitTests/test_bmpimage.cpp | 2 ++ unitTests/test_cr2header_int.cpp | 20 +------------------ unitTests/test_datasets.cpp | 2 ++ unitTests/test_enforce.cpp | 20 +------------------ unitTests/test_futils.cpp | 20 +------------------ unitTests/test_helper_functions.cpp | 20 +------------------ unitTests/test_image_int.cpp | 20 +------------------ unitTests/test_pngimage.cpp | 19 +----------------- unitTests/test_safe_op.cpp | 20 +------------------ unitTests/test_slice.cpp | 20 +------------------ unitTests/test_tiffheader.cpp | 20 +------------------ unitTests/test_types.cpp | 20 +------------------ 114 files changed, 179 insertions(+), 2132 deletions(-) diff --git a/app/actions.cpp b/app/actions.cpp index 09d7dca96f..2394c52444 100644 --- a/app/actions.cpp +++ b/app/actions.cpp @@ -1,26 +1,5 @@ -// ***************************************************************** -*- 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. - */ -/* - File: actions.cpp - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/app/actions.hpp b/app/actions.hpp index b6ff516e91..2655588047 100644 --- a/app/actions.hpp +++ b/app/actions.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file actions.hpp @brief Implements base class Task, TaskFactory and the various supported diff --git a/app/exiv2.cpp b/app/exiv2.cpp index 01f6c1c8e9..5d5a6a2711 100644 --- a/app/exiv2.cpp +++ b/app/exiv2.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include diff --git a/app/getopt.cpp b/app/getopt.cpp index 4fd54d2eb0..9dff95de4b 100644 --- a/app/getopt.cpp +++ b/app/getopt.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #if _MSC_VER >= 1400 # pragma warning(disable : 4996) diff --git a/app/wmain.c b/app/wmain.c index 1141986341..3ef6bd5ea9 100644 --- a/app/wmain.c +++ b/app/wmain.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include extern int __cdecl main(); diff --git a/include/exiv2/ini.hpp b/include/exiv2/ini.hpp index fd6be9ee82..b5e1efd9a4 100755 --- a/include/exiv2/ini.hpp +++ b/include/exiv2/ini.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: BSD-3-Clause // Read an INI file into easy-to-access name/value pairs. diff --git a/src/basicio.cpp b/src/basicio.cpp index 807d75c8eb..c2bf0ab55d 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -1,26 +1,5 @@ -// ***************************************************************** -*- 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. - */ -/* - File: basicio.cpp - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" #include "datasets.hpp" diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index c2d6c8ff7b..a7b8521963 100644 --- a/src/bmffimage.cpp +++ b/src/bmffimage.cpp @@ -1,26 +1,4 @@ -// ***************************************************************** -*- C++ -*- -/* - * Copyright (C) 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. - */ - -// ***************************************************************************** - -// #define EXIV2_DEBUG_MESSAGES +// SPDX-License-Identifier: GPL-2.0-or-later // included header files #include "bmffimage.hpp" diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp index 4e99d04a02..14f737993e 100644 --- a/src/bmpimage.cpp +++ b/src/bmpimage.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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: bmpimage.cpp Author(s): Marco Piovanelli, Ovolab (marco) History: 05-Mar-2007, marco: created */ -// ***************************************************************************** // included header files #include "config.h" diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 5fc630c97e..879a449d44 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -1,29 +1,10 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: canonmn.cpp Author(s): Andreas Huggel (ahu) David Cannings (dc) Andi Clemens (ac) */ -// ***************************************************************************** // included header files #include "error.hpp" #include "types.hpp" diff --git a/src/canonmn_int.hpp b/src/canonmn_int.hpp index 93a0a23a5a..83b6fcae9c 100644 --- a/src/canonmn_int.hpp +++ b/src/canonmn_int.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /*! @file canonmn_int.hpp @brief Canon makernote tags.
References:
diff --git a/src/casiomn_int.cpp b/src/casiomn_int.cpp index db1d7957ff..03456f8652 100644 --- a/src/casiomn_int.cpp +++ b/src/casiomn_int.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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: Casiomn.cpp History: 30-Oct-13, ahu: created Credits: See header file */ -// ***************************************************************************** // included header files #include "types.hpp" #include "casiomn_int.hpp" diff --git a/src/casiomn_int.hpp b/src/casiomn_int.hpp index 4a7cc3c23b..f80ad09176 100644 --- a/src/casiomn_int.hpp +++ b/src/casiomn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file casiomn_int.hpp @brief Casio MakerNote implemented using the following references: diff --git a/src/convert.cpp b/src/convert.cpp index d7348701ab..1c6fbce3a3 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: convert.cpp Author(s): Andreas Huggel (ahu) diff --git a/src/cr2header_int.cpp b/src/cr2header_int.cpp index d3a145c213..a340c214ca 100644 --- a/src/cr2header_int.cpp +++ b/src/cr2header_int.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include "cr2header_int.hpp" namespace Exiv2 { diff --git a/src/cr2header_int.hpp b/src/cr2header_int.hpp index df48cfd058..db3a0ec7cc 100644 --- a/src/cr2header_int.hpp +++ b/src/cr2header_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file cr2image_int.hpp @brief Internal classes to support CR2 image format diff --git a/src/cr2image.cpp b/src/cr2image.cpp index cbbcecbef1..2c8fa89903 100644 --- a/src/cr2image.cpp +++ b/src/cr2image.cpp @@ -1,26 +1,5 @@ -// ***************************************************************** -*- 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. - */ -/* - File: cr2image.cpp - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/crwimage.cpp b/src/crwimage.cpp index 92b16700e7..c6345292cf 100644 --- a/src/crwimage.cpp +++ b/src/crwimage.cpp @@ -1,29 +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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: crwimage.cpp Author(s): Andreas Huggel (ahu) History: 28-Aug-05, ahu: created - */ -// ***************************************************************************** // included header files #include "config.h" diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp index c869b32592..60ed57857c 100644 --- a/src/crwimage_int.cpp +++ b/src/crwimage_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "crwimage_int.hpp" #include "canonmn_int.hpp" diff --git a/src/crwimage_int.hpp b/src/crwimage_int.hpp index 935802f683..e523c9f6c5 100644 --- a/src/crwimage_int.hpp +++ b/src/crwimage_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef CRWIMAGE_INT_HPP_ #define CRWIMAGE_INT_HPP_ diff --git a/src/datasets.cpp b/src/datasets.cpp index 07ee9a3c60..fb85b25c67 100644 --- a/src/datasets.cpp +++ b/src/datasets.cpp @@ -1,29 +1,10 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: datasets.cpp Author(s): Brad Schick (brad) Gilles Caulier (gc) History: 24-Jul-04, brad: created */ -// ***************************************************************************** // included header files #include "datasets.hpp" #include "error.hpp" diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp index 2f216e6150..0c85130452 100644 --- a/src/easyaccess.cpp +++ b/src/easyaccess.cpp @@ -1,26 +1,4 @@ -// ***************************************************************** -*- 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. - */ -/* - File: easyaccess.cpp - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later // included header files #include "easyaccess.hpp" diff --git a/src/epsimage.cpp b/src/epsimage.cpp index 386508b8ad..1fcf55dae5 100644 --- a/src/epsimage.cpp +++ b/src/epsimage.cpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /* File: epsimage.cpp Author(s): Michael Ulbrich (mul) @@ -38,10 +21,8 @@ // + standard includes #include #include -#include #include #include -#include #include #include diff --git a/src/error.cpp b/src/error.cpp index 8141869993..b7386e6818 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -1,33 +1,11 @@ -// ***************************************************************** -*- 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. - */ -/* - File: error.cpp - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "error.hpp" #include "i18n.h" // NLS support. // + standard includes #include -#include #include // ***************************************************************************** diff --git a/src/exif.cpp b/src/exif.cpp index a8054000ec..0bac2318bd 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /* File: exif.cpp Author(s): Andreas Huggel (ahu) diff --git a/src/fujimn_int.cpp b/src/fujimn_int.cpp index 7f2f53ca21..4e88771837 100644 --- a/src/fujimn_int.cpp +++ b/src/fujimn_int.cpp @@ -1,24 +1,5 @@ -// ***************************************************************** -*- C++ -*- +// SPDX-License-Identifier: GPL-2.0-or-later /* - * 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. - */ -/* - File: fujimn.cpp Author(s): Andreas Huggel (ahu) Gilles Caulier (gc) History: 18-Feb-04, ahu: created diff --git a/src/fujimn_int.hpp b/src/fujimn_int.hpp index 1f8e6ff8a1..1ea8f8692e 100644 --- a/src/fujimn_int.hpp +++ b/src/fujimn_int.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FUJIMN_INT_HPP_ #define FUJIMN_INT_HPP_ diff --git a/src/futils.cpp b/src/futils.cpp index be13d424eb..430223d24b 100644 --- a/src/futils.cpp +++ b/src/futils.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" @@ -27,20 +9,11 @@ #include "image_int.hpp" // + standard includes -#include -#include - #include #include -#include -#include -#include #include #include #include -#ifdef EXV_HAVE_UNISTD_H -#include // for stat() -#endif namespace fs = std::filesystem; diff --git a/src/gifimage.cpp b/src/gifimage.cpp index b9e17bdf8d..6fb65e838a 100644 --- a/src/gifimage.cpp +++ b/src/gifimage.cpp @@ -1,37 +1,12 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" #include "gifimage.hpp" -#include "image.hpp" -#include "basicio.hpp" #include "error.hpp" #include "futils.hpp" -// + standard includes -#include -#include -#include - // ***************************************************************************** // class member definitions namespace Exiv2 { diff --git a/src/helper_functions.cpp b/src/helper_functions.cpp index e01a8bf20c..045495cfc9 100644 --- a/src/helper_functions.cpp +++ b/src/helper_functions.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "helper_functions.hpp" #include diff --git a/src/helper_functions.hpp b/src/helper_functions.hpp index 6ec990d6a3..25f9c676d4 100644 --- a/src/helper_functions.hpp +++ b/src/helper_functions.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef HELPER_FUNCTIONS_HPP #define HELPER_FUNCTIONS_HPP diff --git a/src/http.cpp b/src/http.cpp index 5c04fd686c..1fbcf8c02c 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -1,22 +1,4 @@ -// ********************************************************* -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MINGW64__) || defined(__MINGW32__) #define __USE_W32_SOCKETS diff --git a/src/image.cpp b/src/image.cpp index 945747ad2e..a56b3c3151 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/image_int.cpp b/src/image_int.cpp index 84ea26b7e1..e16a167644 100644 --- a/src/image_int.cpp +++ b/src/image_int.cpp @@ -1,28 +1,10 @@ -/* - * 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "image_int.hpp" #include #include #include -#include #include namespace Exiv2 diff --git a/src/image_int.hpp b/src/image_int.hpp index 7058795caf..584dd2d212 100644 --- a/src/image_int.hpp +++ b/src/image_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef IMAGE_INT_HPP_ #define IMAGE_INT_HPP_ diff --git a/src/ini.cpp b/src/ini.cpp index 827bd5100d..1a3967ab0c 100755 --- a/src/ini.cpp +++ b/src/ini.cpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later // Read an INI file into easy-to-access name/value pairs. @@ -35,15 +18,6 @@ using std::string; using namespace Exiv2; -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -https://github.com/benhoyt/inih - -*/ - #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif diff --git a/src/iptc.cpp b/src/iptc.cpp index 776ef9ca11..c7b66f0ec2 100644 --- a/src/iptc.cpp +++ b/src/iptc.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "iptc.hpp" #include "types.hpp" diff --git a/src/jp2image.cpp b/src/jp2image.cpp index 078e3a4d9d..05e33edb06 100644 --- a/src/jp2image.cpp +++ b/src/jp2image.cpp @@ -1,24 +1,4 @@ -// ***************************************************************** -*- 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. - */ - -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later // included header files #include "config.h" diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp index 9f55ada0e0..d75f5acf19 100644 --- a/src/jpgimage.cpp +++ b/src/jpgimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index 4ac1e813fd..04cf02e29f 100644 --- a/src/makernote_int.cpp +++ b/src/makernote_int.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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /* File: makernote.cpp Author(s): Andreas Huggel (ahu) History: 11-Apr-06, ahu: created */ -// ***************************************************************************** // included header files #include "config.h" diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp index 6a57e4031c..da710595ea 100644 --- a/src/makernote_int.hpp +++ b/src/makernote_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef MAKERNOTE_INT_HPP_ #define MAKERNOTE_INT_HPP_ diff --git a/src/metadatum.cpp b/src/metadatum.cpp index 2a5be1ff5e..7f85046ff4 100644 --- a/src/metadatum.cpp +++ b/src/metadatum.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "metadatum.hpp" diff --git a/src/minoltamn_int.cpp b/src/minoltamn_int.cpp index 6e761fa476..2bd70c869a 100644 --- a/src/minoltamn_int.cpp +++ b/src/minoltamn_int.cpp @@ -1,24 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later -// ***************************************************************************** // included header files #include "minoltamn_int.hpp" #include "tags_int.hpp" diff --git a/src/minoltamn_int.hpp b/src/minoltamn_int.hpp index e8aa99243b..2cbcb3ab8b 100644 --- a/src/minoltamn_int.hpp +++ b/src/minoltamn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef MINOLTAMN_INT_HPP_ #define MINOLTAMN_INT_HPP_ diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp index be96c649b9..934fcb7640 100644 --- a/src/mrwimage.cpp +++ b/src/mrwimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index fedaddbd76..6729d62e30 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -1,26 +1,5 @@ -// ***************************************************************** -*- C++ -*- -/* - * Lens database for the conversion of Nikon lens data to readable lens names - * Copyright (C) 2005-2014 Robert Rottmerhusen - * - * 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "nikonmn_int.hpp" diff --git a/src/nikonmn_int.hpp b/src/nikonmn_int.hpp index 37fba84c32..46908fd83f 100644 --- a/src/nikonmn_int.hpp +++ b/src/nikonmn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /*! @file nikonmn_int.hpp @brief Nikon makernote tags.
References:
diff --git a/src/olympusmn_int.cpp b/src/olympusmn_int.cpp index 9c71c469a9..8cdb9ef326 100644 --- a/src/olympusmn_int.cpp +++ b/src/olympusmn_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later // ***************************************************************************** // included header files diff --git a/src/olympusmn_int.hpp b/src/olympusmn_int.hpp index 34e9677d8b..75c34f3325 100644 --- a/src/olympusmn_int.hpp +++ b/src/olympusmn_int.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later /*! @file olympusmn_int.hpp @brief Olympus makernote tags.
References:
diff --git a/src/orfimage.cpp b/src/orfimage.cpp index 645bb9aa55..919c89a172 100644 --- a/src/orfimage.cpp +++ b/src/orfimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/orfimage_int.cpp b/src/orfimage_int.cpp index 09718c6043..a0cf92e362 100644 --- a/src/orfimage_int.cpp +++ b/src/orfimage_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "orfimage_int.hpp" diff --git a/src/orfimage_int.hpp b/src/orfimage_int.hpp index af77345a3b..7bb7440468 100644 --- a/src/orfimage_int.hpp +++ b/src/orfimage_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef ORFIMAGE_INT_HPP_ #define ORFIMAGE_INT_HPP_ diff --git a/src/panasonicmn_int.cpp b/src/panasonicmn_int.cpp index cbe1a65a0e..dab90e2992 100644 --- a/src/panasonicmn_int.cpp +++ b/src/panasonicmn_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "panasonicmn_int.hpp" diff --git a/src/panasonicmn_int.hpp b/src/panasonicmn_int.hpp index 4acde7971c..a7ae4e3a20 100644 --- a/src/panasonicmn_int.hpp +++ b/src/panasonicmn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PANASONICMN_INT_HPP_ #define PANASONICMN_INT_HPP_ diff --git a/src/pentaxmn_int.cpp b/src/pentaxmn_int.cpp index e78aacb631..4234ecde95 100644 --- a/src/pentaxmn_int.cpp +++ b/src/pentaxmn_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "pentaxmn_int.hpp" diff --git a/src/pentaxmn_int.hpp b/src/pentaxmn_int.hpp index ec407027d6..11d245e9ee 100644 --- a/src/pentaxmn_int.hpp +++ b/src/pentaxmn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PENTAXMN_INT_HPP_ #define PENTAXMN_INT_HPP_ diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp index e21f0817bc..fee16ad029 100644 --- a/src/pgfimage.cpp +++ b/src/pgfimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/pngchunk_int.cpp b/src/pngchunk_int.cpp index 33a013e600..13362013a2 100644 --- a/src/pngchunk_int.cpp +++ b/src/pngchunk_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/pngchunk_int.hpp b/src/pngchunk_int.hpp index 48806bc096..3bc8be2f26 100644 --- a/src/pngchunk_int.hpp +++ b/src/pngchunk_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef PNGCHUNK_INT_HPP_ #define PNGCHUNK_INT_HPP_ diff --git a/src/pngimage.cpp b/src/pngimage.cpp index 90ece7cf31..978df0b903 100644 --- a/src/pngimage.cpp +++ b/src/pngimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/preview.cpp b/src/preview.cpp index 4141ba5bee..9b08005a50 100644 --- a/src/preview.cpp +++ b/src/preview.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/properties.cpp b/src/properties.cpp index 31ed9c3930..b50a68e189 100644 --- a/src/properties.cpp +++ b/src/properties.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "properties.hpp" #include "tags_int.hpp" diff --git a/src/psdimage.cpp b/src/psdimage.cpp index 6b509344ad..5a9380827b 100644 --- a/src/psdimage.cpp +++ b/src/psdimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/rafimage.cpp b/src/rafimage.cpp index 4dc9a2b109..cf3e4182ed 100644 --- a/src/rafimage.cpp +++ b/src/rafimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/rw2image.cpp b/src/rw2image.cpp index 6a0e51c660..47be7da424 100644 --- a/src/rw2image.cpp +++ b/src/rw2image.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/rw2image_int.cpp b/src/rw2image_int.cpp index f191691866..124bbe3445 100644 --- a/src/rw2image_int.cpp +++ b/src/rw2image_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rw2image_int.hpp" diff --git a/src/rw2image_int.hpp b/src/rw2image_int.hpp index c744385779..a45f3ecf93 100644 --- a/src/rw2image_int.hpp +++ b/src/rw2image_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef RW2IMAGE_INT_HPP_ #define RW2IMAGE_INT_HPP_ diff --git a/src/safe_op.hpp b/src/safe_op.hpp index 8972e71852..de042481bc 100644 --- a/src/safe_op.hpp +++ b/src/safe_op.hpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef SAFE_OP_HPP_ #define SAFE_OP_HPP_ diff --git a/src/samsungmn_int.cpp b/src/samsungmn_int.cpp index 81f564ba6e..ef230fce9e 100644 --- a/src/samsungmn_int.cpp +++ b/src/samsungmn_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "samsungmn_int.hpp" diff --git a/src/samsungmn_int.hpp b/src/samsungmn_int.hpp index dcf4ec82b5..496115682a 100644 --- a/src/samsungmn_int.hpp +++ b/src/samsungmn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef SAMSUNGMN_INT_HPP_ #define SAMSUNGMN_INT_HPP_ diff --git a/src/sigmamn_int.cpp b/src/sigmamn_int.cpp index f69044848c..7bddc45dd5 100644 --- a/src/sigmamn_int.cpp +++ b/src/sigmamn_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "sigmamn_int.hpp" diff --git a/src/sigmamn_int.hpp b/src/sigmamn_int.hpp index 03467a9432..89d4131255 100644 --- a/src/sigmamn_int.hpp +++ b/src/sigmamn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef SIGMAMN_INT_HPP_ #define SIGMAMN_INT_HPP_ diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp index 88bacd1542..3ec0a3b4c9 100644 --- a/src/sonymn_int.cpp +++ b/src/sonymn_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "minoltamn_int.hpp" diff --git a/src/sonymn_int.hpp b/src/sonymn_int.hpp index a2de831d44..76b5327a4d 100644 --- a/src/sonymn_int.hpp +++ b/src/sonymn_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef SONYMN_INT_HPP_ #define SONYMN_INT_HPP_ diff --git a/src/tags.cpp b/src/tags.cpp index d2b3dacec3..b658aec554 100644 --- a/src/tags.cpp +++ b/src/tags.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "tags.hpp" diff --git a/src/tags_int.cpp b/src/tags_int.cpp index f125972956..a09049c4b1 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -1,23 +1,4 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later // included header files #include "tags_int.hpp" diff --git a/src/tags_int.hpp b/src/tags_int.hpp index 8576de3ff8..fb8bdc3406 100644 --- a/src/tags_int.hpp +++ b/src/tags_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TAGS_INT_HPP_ #define TAGS_INT_HPP_ diff --git a/src/tgaimage.cpp b/src/tgaimage.cpp index 61031b9d48..ee1705f1d2 100644 --- a/src/tgaimage.cpp +++ b/src/tgaimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/tiffcomposite_int.cpp b/src/tiffcomposite_int.cpp index a2ce2ef333..bf3d95707a 100644 --- a/src/tiffcomposite_int.cpp +++ b/src/tiffcomposite_int.cpp @@ -1,23 +1,4 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later // included header files #include "config.h" diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp index 604b8b2c25..7171f37848 100644 --- a/src/tiffcomposite_int.hpp +++ b/src/tiffcomposite_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TIFFCOMPOSITE_INT_HPP_ #define TIFFCOMPOSITE_INT_HPP_ diff --git a/src/tifffwd_int.hpp b/src/tifffwd_int.hpp index fd355e64a8..cf3976c38f 100644 --- a/src/tifffwd_int.hpp +++ b/src/tifffwd_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TIFFFWD_INT_HPP_ #define TIFFFWD_INT_HPP_ diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp index e693c715b2..478734766e 100644 --- a/src/tiffimage.cpp +++ b/src/tiffimage.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp index 87084797ab..21db0e16cb 100644 --- a/src/tiffimage_int.cpp +++ b/src/tiffimage_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "tiffimage_int.hpp" #include "error.hpp" diff --git a/src/tiffimage_int.hpp b/src/tiffimage_int.hpp index 9429297703..ca07786656 100644 --- a/src/tiffimage_int.hpp +++ b/src/tiffimage_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TIFFIMAGE_INT_HPP_ #define TIFFIMAGE_INT_HPP_ diff --git a/src/tiffvisitor_int.cpp b/src/tiffvisitor_int.cpp index 8ea7b31a6f..ba4e47d2d3 100644 --- a/src/tiffvisitor_int.cpp +++ b/src/tiffvisitor_int.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "config.h" diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp index f1d3a8773d..025ea0b145 100644 --- a/src/tiffvisitor_int.hpp +++ b/src/tiffvisitor_int.hpp @@ -1,22 +1,5 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + #ifndef TIFFVISITOR_INT_HPP_ #define TIFFVISITOR_INT_HPP_ diff --git a/src/types.cpp b/src/types.cpp index ac59f9c062..5018d7e8de 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "types.hpp" #include "enforce.hpp" diff --git a/src/unused.h b/src/unused.h index bcfa58c09c..fd2fc86e95 100644 --- a/src/unused.h +++ b/src/unused.h @@ -1,21 +1,4 @@ -/* - * Copyright (C) 2004-2018 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef UNUSED_H #define UNUSED_H diff --git a/src/value.cpp b/src/value.cpp index 5bc3687f02..3166b04556 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "value.hpp" #include "types.hpp" diff --git a/src/version.cpp b/src/version.cpp index c3e2953a54..12c1ce76d8 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,23 +1,4 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later #include "config.h" diff --git a/src/webpimage.cpp b/src/webpimage.cpp index 6562010f6d..830801bdd1 100644 --- a/src/webpimage.cpp +++ b/src/webpimage.cpp @@ -1,28 +1,10 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later + /* Google's WEBP container spec can be found at the link below: https://developers.google.com/speed/webp/docs/riff_container */ -// ***************************************************************************** // included header files #include "config.h" diff --git a/src/xmp.cpp b/src/xmp.cpp index c3baa081f5..18913ea3b6 100644 --- a/src/xmp.cpp +++ b/src/xmp.cpp @@ -1,23 +1,5 @@ -// ***************************************************************** -*- 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 f; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. - */ -// ***************************************************************************** +// SPDX-License-Identifier: GPL-2.0-or-later + // included header files #include "xmp_exiv2.hpp" #include "types.hpp" diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp index cb709a5ce7..45783e1775 100644 --- a/src/xmpsidecar.cpp +++ b/src/xmpsidecar.cpp @@ -1,24 +1,4 @@ -// ***************************************************************** -*- 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. - */ -// ***************************************************************************** -// included header files +// SPDX-License-Identifier: GPL-2.0-or-later #include "config.h" #include "xmpsidecar.hpp" diff --git a/unitTests/mainTestRunner.cpp b/unitTests/mainTestRunner.cpp index 714ee6beab..b12bd935f5 100644 --- a/unitTests/mainTestRunner.cpp +++ b/unitTests/mainTestRunner.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_DateValue.cpp b/unitTests/test_DateValue.cpp index ed968d3ac4..6ad96fd76c 100644 --- a/unitTests/test_DateValue.cpp +++ b/unitTests/test_DateValue.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "value.hpp" diff --git a/unitTests/test_FileIo.cpp b/unitTests/test_FileIo.cpp index b5c1e7af4f..05afe2dadc 100644 --- a/unitTests/test_FileIo.cpp +++ b/unitTests/test_FileIo.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "basicio.hpp" #include diff --git a/unitTests/test_ImageFactory.cpp b/unitTests/test_ImageFactory.cpp index a74811016a..b84d7c6357 100644 --- a/unitTests/test_ImageFactory.cpp +++ b/unitTests/test_ImageFactory.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include // Unit under test #include // Need to include this header for the Exiv2::Error exception diff --git a/unitTests/test_IptcKey.cpp b/unitTests/test_IptcKey.cpp index 2b12536c5d..e074935b68 100644 --- a/unitTests/test_IptcKey.cpp +++ b/unitTests/test_IptcKey.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include #include diff --git a/unitTests/test_LangAltValueRead.cpp b/unitTests/test_LangAltValueRead.cpp index 7f0dd663b3..3fd020da56 100644 --- a/unitTests/test_LangAltValueRead.cpp +++ b/unitTests/test_LangAltValueRead.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include diff --git a/unitTests/test_TimeValue.cpp b/unitTests/test_TimeValue.cpp index 8249d035c6..f2ec484f9c 100644 --- a/unitTests/test_TimeValue.cpp +++ b/unitTests/test_TimeValue.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "value.hpp" #include diff --git a/unitTests/test_XmpKey.cpp b/unitTests/test_XmpKey.cpp index ead7bb8379..52bc189e35 100644 --- a/unitTests/test_XmpKey.cpp +++ b/unitTests/test_XmpKey.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_basicio.cpp b/unitTests/test_basicio.cpp index ad39d92232..15b20d65b3 100644 --- a/unitTests/test_basicio.cpp +++ b/unitTests/test_basicio.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_bmpimage.cpp b/unitTests/test_bmpimage.cpp index 30a9eaa90b..2b7f144a36 100644 --- a/unitTests/test_bmpimage.cpp +++ b/unitTests/test_bmpimage.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include #include diff --git a/unitTests/test_cr2header_int.cpp b/unitTests/test_cr2header_int.cpp index 881fc2054c..4d40c3c07f 100644 --- a/unitTests/test_cr2header_int.cpp +++ b/unitTests/test_cr2header_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "cr2header_int.hpp" #include diff --git a/unitTests/test_datasets.cpp b/unitTests/test_datasets.cpp index 781bdda838..ef02a83e27 100644 --- a/unitTests/test_datasets.cpp +++ b/unitTests/test_datasets.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + #include #include diff --git a/unitTests/test_enforce.cpp b/unitTests/test_enforce.cpp index 7480b9475e..9b5486c032 100644 --- a/unitTests/test_enforce.cpp +++ b/unitTests/test_enforce.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_futils.cpp b/unitTests/test_futils.cpp index 93bdfa2009..2a1db5b824 100644 --- a/unitTests/test_futils.cpp +++ b/unitTests/test_futils.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include // File under test diff --git a/unitTests/test_helper_functions.cpp b/unitTests/test_helper_functions.cpp index 384e02468b..268e2f3ef9 100644 --- a/unitTests/test_helper_functions.cpp +++ b/unitTests/test_helper_functions.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include "helper_functions.hpp" #include diff --git a/unitTests/test_image_int.cpp b/unitTests/test_image_int.cpp index 72220eacb1..609b8f8340 100644 --- a/unitTests/test_image_int.cpp +++ b/unitTests/test_image_int.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_pngimage.cpp b/unitTests/test_pngimage.cpp index 51b7c61fbd..5f77fad53f 100644 --- a/unitTests/test_pngimage.cpp +++ b/unitTests/test_pngimage.cpp @@ -1,21 +1,4 @@ -/* - * Copyright (C) 2004-2022 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include "pngchunk_int.hpp" // This is not part of the public API diff --git a/unitTests/test_safe_op.cpp b/unitTests/test_safe_op.cpp index 01eba636b5..c44b1f3dac 100644 --- a/unitTests/test_safe_op.cpp +++ b/unitTests/test_safe_op.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp index f3acadae4d..85427cd500 100644 --- a/unitTests/test_slice.cpp +++ b/unitTests/test_slice.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_tiffheader.cpp b/unitTests/test_tiffheader.cpp index f3fb373381..bc412d7a56 100644 --- a/unitTests/test_tiffheader.cpp +++ b/unitTests/test_tiffheader.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include diff --git a/unitTests/test_types.cpp b/unitTests/test_types.cpp index 96c5742c46..1f09417b64 100644 --- a/unitTests/test_types.cpp +++ b/unitTests/test_types.cpp @@ -1,22 +1,4 @@ -// ***************************************************************** -*- 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. - */ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include From e414018bcbbd9523f6d0ae8e4e227daacbc6cabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 3 Mar 2022 19:34:10 +0100 Subject: [PATCH 3/5] Fix usage of SPDX for files with 2 licenses --- include/exiv2/ini.hpp | 3 +-- src/ini.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/exiv2/ini.hpp b/include/exiv2/ini.hpp index b5e1efd9a4..1c25563337 100755 --- a/include/exiv2/ini.hpp +++ b/include/exiv2/ini.hpp @@ -1,5 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-License-Identifier: BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause // Read an INI file into easy-to-access name/value pairs. // inih and INIReader are released under the New BSD license (see LICENSE.txt). diff --git a/src/ini.cpp b/src/ini.cpp index 1a3967ab0c..1e005e476f 100755 --- a/src/ini.cpp +++ b/src/ini.cpp @@ -1,5 +1,4 @@ -// SPDX-License-Identifier: BSD-3-Clause -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause // Read an INI file into easy-to-access name/value pairs. From 91ee2b47a2c94bbc5232ed4aef5fd5c5574c6875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 3 Mar 2022 19:34:21 +0100 Subject: [PATCH 4/5] Add global license file --- LICENSE.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000000..a02bc95245 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,17 @@ +This program is part of the Exiv2 distribution. +Copyright (C) 2004-2022 Exiv2 authors + +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, Fifth Floor, Boston, MA 02110-1301, USA. + +--------------------------------------------------------------------------- +Note: +Individual files contain the following tag instead of the full license text. + + SPDX-License-Identifier: GPL-2.0-or-later + +This enables machine processing of license information based on the SPDX +License Identifiers that are here available: http://spdx.org/licenses/ From 65e8f6bc3ddf206e3cffc36b7c8fb3234b7ede39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 3 Mar 2022 19:43:31 +0100 Subject: [PATCH 5/5] Fix compilation --- src/futils.cpp | 4 ++++ src/gifimage.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/futils.cpp b/src/futils.cpp index 430223d24b..4640df8039 100644 --- a/src/futils.cpp +++ b/src/futils.cpp @@ -15,6 +15,10 @@ #include #include +#ifdef EXV_HAVE_UNISTD_H +#include // for stat() +#endif + namespace fs = std::filesystem; #if defined(WIN32) diff --git a/src/gifimage.cpp b/src/gifimage.cpp index 6fb65e838a..f483355ab4 100644 --- a/src/gifimage.cpp +++ b/src/gifimage.cpp @@ -7,6 +7,8 @@ #include "error.hpp" #include "futils.hpp" +#include + // ***************************************************************************** // class member definitions namespace Exiv2 {