From 99b4e7145988c6fc8910e16fb65409db06cfe43b Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Tue, 17 Jan 2006 14:53:57 +0000 Subject: [PATCH] Updated copyright and fsf address --- COPYING | 2 +- README | 5 ++--- config/config.mk.in | 5 ++--- doc/templates/gpl-license.html.in | 2 +- msvc/exivsimple/exivsimple.cpp | 4 ++-- msvc/exivsimple/exivsimple.h | 4 ++-- msvc/exivsimple/stdafx.cpp | 4 ++-- msvc/exivsimple/stdafx.h | 4 ++-- src/Makefile | 5 ++--- src/actions.cpp | 4 ++-- src/actions.hpp | 4 ++-- src/basicio.cpp | 4 ++-- src/basicio.hpp | 4 ++-- src/canonmn.cpp | 4 ++-- src/canonmn.hpp | 4 ++-- src/crwimage.cpp | 4 ++-- src/crwimage.hpp | 4 ++-- src/datasets.cpp | 4 ++-- src/datasets.hpp | 4 ++-- src/doxygen.hpp | 7 +++---- src/error.cpp | 4 ++-- src/error.hpp | 4 ++-- src/exif.cpp | 4 ++-- src/exif.hpp | 4 ++-- src/exiv2.cpp | 26 +++++++++++++++++++------- src/exiv2.hpp | 4 ++-- src/fujimn.cpp | 4 ++-- src/fujimn.hpp | 4 ++-- src/futils.cpp | 4 ++-- src/futils.hpp | 4 ++-- src/ifd.cpp | 4 ++-- src/ifd.hpp | 4 ++-- src/image.cpp | 4 ++-- src/image.hpp | 4 ++-- src/imgreg.cpp | 4 ++-- src/iotest.cpp | 4 ++-- src/iptc.cpp | 4 ++-- src/iptc.hpp | 4 ++-- src/jpgimage.cpp | 4 ++-- src/jpgimage.hpp | 4 ++-- src/makernote.cpp | 4 ++-- src/makernote.hpp | 4 ++-- src/metacopy.cpp | 4 ++-- src/metacopy.hpp | 4 ++-- src/metadatum.cpp | 4 ++-- src/metadatum.hpp | 4 ++-- src/mn.hpp | 4 ++-- src/nikonmn.cpp | 4 ++-- src/nikonmn.hpp | 4 ++-- src/olympusmn.cpp | 4 ++-- src/olympusmn.hpp | 4 ++-- src/panasonicmn.cpp | 4 ++-- src/panasonicmn.hpp | 4 ++-- src/rcsid.hpp | 4 ++-- src/sigmamn.cpp | 4 ++-- src/sigmamn.hpp | 4 ++-- src/sonymn.cpp | 4 ++-- src/sonymn.hpp | 4 ++-- src/tags.cpp | 4 ++-- src/tags.hpp | 4 ++-- src/types.cpp | 4 ++-- src/types.hpp | 4 ++-- src/utils.cpp | 4 ++-- src/utils.hpp | 4 ++-- src/value.cpp | 4 ++-- src/value.hpp | 4 ++-- test/data/exiv2-test.out | 19 ++++++++++++++++--- 67 files changed, 164 insertions(+), 143 deletions(-) diff --git a/COPYING b/COPYING index aa0aea5b..c484a904 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/README b/README index ec014dac..18546a5d 100644 --- a/README +++ b/README @@ -91,7 +91,7 @@ of shared libraries can be turned off by specifying the License ======= -Copyright (C) 2004, 2005 Andreas Huggel +Copyright (C) 2004, 2005, 2006 Andreas Huggel Exiv2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -105,5 +105,4 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -USA. +Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. diff --git a/config/config.mk.in b/config/config.mk.in index e7c0c45e..354fd17f 100644 --- a/config/config.mk.in +++ b/config/config.mk.in @@ -1,6 +1,6 @@ # ***************************************************** -*- Makefile -*- # -# Copyright (C) 2004, 2005 Andreas Huggel +# Copyright (C) 2004, 2005, 2006 Andreas Huggel # # This Makefile is part of the Exiv2 distribution. # @@ -16,8 +16,7 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. # # File: config.mk.in # Version: $Rev$ diff --git a/doc/templates/gpl-license.html.in b/doc/templates/gpl-license.html.in index ce66d87e..7677fa59 100644 --- a/doc/templates/gpl-license.html.in +++ b/doc/templates/gpl-license.html.in @@ -23,7 +23,7 @@ __index1__

Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

diff --git a/msvc/exivsimple/exivsimple.cpp b/msvc/exivsimple/exivsimple.cpp index 4accd48d..61cbbe2b 100644 --- a/msvc/exivsimple/exivsimple.cpp +++ b/msvc/exivsimple/exivsimple.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: exivsimple.cpp diff --git a/msvc/exivsimple/exivsimple.h b/msvc/exivsimple/exivsimple.h index c70d5a10..1da365a4 100644 --- a/msvc/exivsimple/exivsimple.h +++ b/msvc/exivsimple/exivsimple.h @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file exivsimple.h diff --git a/msvc/exivsimple/stdafx.cpp b/msvc/exivsimple/stdafx.cpp index 7528f462..ffd69ba5 100644 --- a/msvc/exivsimple/stdafx.cpp +++ b/msvc/exivsimple/stdafx.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: stdafx.cpp diff --git a/msvc/exivsimple/stdafx.h b/msvc/exivsimple/stdafx.h index aaa93fb1..9aac27a6 100644 --- a/msvc/exivsimple/stdafx.h +++ b/msvc/exivsimple/stdafx.h @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file stdafx.h diff --git a/src/Makefile b/src/Makefile index e7d14df1..a0069c5d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ # ************************************************************* -*- Makefile -*- # -# Copyright (C) 2004, 2005 Andreas Huggel +# Copyright (C) 2004, 2005, 2006 Andreas Huggel # # This Makefile is part of the Exiv2 distribution. # @@ -16,8 +16,7 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. # # File: Makefile # Version: $Rev$ diff --git a/src/actions.cpp b/src/actions.cpp index 2b9d7a3e..7c4834ad 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: actions.cpp diff --git a/src/actions.hpp b/src/actions.hpp index 42fd2cdd..e12c5c21 100644 --- a/src/actions.hpp +++ b/src/actions.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file actions.hpp diff --git a/src/basicio.cpp b/src/basicio.cpp index 479afcd2..fc8fb781 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: basicio.cpp diff --git a/src/basicio.hpp b/src/basicio.hpp index 3cceeb0a..8c2f6de1 100644 --- a/src/basicio.hpp +++ b/src/basicio.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file basicio.hpp diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 8082d03e..4e55ca0b 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: canonmn.cpp diff --git a/src/canonmn.hpp b/src/canonmn.hpp index 85edd5c4..53a80257 100644 --- a/src/canonmn.hpp +++ b/src/canonmn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file canonmn.hpp diff --git a/src/crwimage.cpp b/src/crwimage.cpp index 0dd53c04..afb30313 100644 --- a/src/crwimage.cpp +++ b/src/crwimage.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: crwimage.cpp diff --git a/src/crwimage.hpp b/src/crwimage.hpp index fc605c79..7593525d 100644 --- a/src/crwimage.hpp +++ b/src/crwimage.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file crwimage.hpp diff --git a/src/datasets.cpp b/src/datasets.cpp index bf0d0eb2..1b5ef031 100644 --- a/src/datasets.cpp +++ b/src/datasets.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: datasets.cpp diff --git a/src/datasets.hpp b/src/datasets.hpp index 07b90563..140d3449 100644 --- a/src/datasets.hpp +++ b/src/datasets.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file datasets.hpp diff --git a/src/doxygen.hpp b/src/doxygen.hpp index cb4d05ac..e3ac2538 100644 --- a/src/doxygen.hpp +++ b/src/doxygen.hpp @@ -94,7 +94,7 @@ bug tracking system.

@section license License -

Copyright (C) 2004, 2005 Andreas Huggel

+

Copyright (C) 2004, 2005, 2006 Andreas Huggel

%Exiv2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -107,9 +107,8 @@ bug tracking system.

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., 59 - Temple Place - Suite 330, Boston, MA 02111-1307, USA.

- + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @example addmoddel.cpp diff --git a/src/error.cpp b/src/error.cpp index e070be18..25d15ee0 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: error.cpp diff --git a/src/error.hpp b/src/error.hpp index a6717992..808874c4 100644 --- a/src/error.hpp +++ b/src/error.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file error.hpp diff --git a/src/exif.cpp b/src/exif.cpp index 4040e204..d75685a3 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: exif.cpp diff --git a/src/exif.hpp b/src/exif.hpp index 65ad93eb..e9fccaf6 100644 --- a/src/exif.hpp +++ b/src/exif.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file exif.hpp diff --git a/src/exiv2.cpp b/src/exiv2.cpp index e658fa43..1a35b91e 100644 --- a/src/exiv2.cpp +++ b/src/exiv2.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* Abstract: Command line program to display and manipulate image %Exif data @@ -169,11 +169,23 @@ void Params::cleanup() void Params::version(std::ostream& os) const { - os << EXV_PACKAGE_STRING << ", " - << "Copyright (C) 2004, 2005 Andreas Huggel.\n\n" - << "This is free software; see the source for copying conditions. " - << "There is NO \nwarranty; not even for MERCHANTABILITY or FITNESS FOR " - << "A PARTICULAR PURPOSE.\n"; + os << EXV_PACKAGE_STRING << "\n" + << "Copyright (C) 2004, 2005, 2006 Andreas Huggel.\n" + << "\n" + << "This program is free software; you can redistribute it and/or\n" + << "modify it under the terms of the GNU General Public License\n" + << "as published by the Free Software Foundation; either version 2\n" + << "of the License, or (at your option) any later version.\n" + << "\n" + << "This program is distributed in the hope that it will be useful,\n" + << "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + << "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + << "GNU General Public License for more details.\n" + << "\n" + << "You should have received a copy of the GNU General Public\n" + << "License along with this program; if not, write to the Free\n" + << "Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n" + << "Boston, MA 02110-1301 USA\n"; } void Params::usage(std::ostream& os) const diff --git a/src/exiv2.hpp b/src/exiv2.hpp index 6141212a..d7b176c7 100644 --- a/src/exiv2.hpp +++ b/src/exiv2.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file exiv2.hpp diff --git a/src/fujimn.cpp b/src/fujimn.cpp index 3f0aaa16..3cc840c4 100644 --- a/src/fujimn.cpp +++ b/src/fujimn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: fujimn.cpp diff --git a/src/fujimn.hpp b/src/fujimn.hpp index 2fb80ac0..e70f3692 100644 --- a/src/fujimn.hpp +++ b/src/fujimn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file fujimn.hpp diff --git a/src/futils.cpp b/src/futils.cpp index e6788389..f8ec352d 100644 --- a/src/futils.cpp +++ b/src/futils.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: utils.cpp diff --git a/src/futils.hpp b/src/futils.hpp index fdfcfa8c..928a00a5 100644 --- a/src/futils.hpp +++ b/src/futils.hpp @@ -1,6 +1,6 @@ // ********************************************************* -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file futils.hpp diff --git a/src/ifd.cpp b/src/ifd.cpp index c19d6abb..500d6615 100644 --- a/src/ifd.cpp +++ b/src/ifd.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: ifd.cpp diff --git a/src/ifd.hpp b/src/ifd.hpp index b0313595..7cf7aeb9 100644 --- a/src/ifd.hpp +++ b/src/ifd.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file ifd.hpp diff --git a/src/image.cpp b/src/image.cpp index 551223a0..a25263ed 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: image.cpp diff --git a/src/image.hpp b/src/image.hpp index 50fd02ce..20e905e4 100644 --- a/src/image.hpp +++ b/src/image.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file image.hpp diff --git a/src/imgreg.cpp b/src/imgreg.cpp index 894467ed..941fde06 100644 --- a/src/imgreg.cpp +++ b/src/imgreg.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: imgreg.cpp diff --git a/src/iotest.cpp b/src/iotest.cpp index fffe093a..07dfc539 100644 --- a/src/iotest.cpp +++ b/src/iotest.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* Abstract : Tester application for BasicIo functions. Tests MemIo primarily diff --git a/src/iptc.cpp b/src/iptc.cpp index a53b0972..b96802be 100644 --- a/src/iptc.cpp +++ b/src/iptc.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: iptc.cpp diff --git a/src/iptc.hpp b/src/iptc.hpp index f20ca855..17e22c25 100644 --- a/src/iptc.hpp +++ b/src/iptc.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file iptc.hpp diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp index b48102ee..37b12c6a 100644 --- a/src/jpgimage.cpp +++ b/src/jpgimage.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: jpgimage.cpp diff --git a/src/jpgimage.hpp b/src/jpgimage.hpp index 9a43bbbe..89777955 100644 --- a/src/jpgimage.hpp +++ b/src/jpgimage.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file jpgimage.hpp diff --git a/src/makernote.cpp b/src/makernote.cpp index 9ba427af..107b77f8 100644 --- a/src/makernote.cpp +++ b/src/makernote.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: makernote.cpp diff --git a/src/makernote.hpp b/src/makernote.hpp index 1de6607f..2154bf02 100644 --- a/src/makernote.hpp +++ b/src/makernote.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file makernote.hpp diff --git a/src/metacopy.cpp b/src/metacopy.cpp index 1a01567e..65490d80 100644 --- a/src/metacopy.cpp +++ b/src/metacopy.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* Abstract : Tester application for image file handling diff --git a/src/metacopy.hpp b/src/metacopy.hpp index 8c97549b..61d9aeba 100644 --- a/src/metacopy.hpp +++ b/src/metacopy.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file metacopy.hpp diff --git a/src/metadatum.cpp b/src/metadatum.cpp index a0817b45..7253dd52 100644 --- a/src/metadatum.cpp +++ b/src/metadatum.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: metadatum.cpp diff --git a/src/metadatum.hpp b/src/metadatum.hpp index 131e492e..4ae7ee0b 100644 --- a/src/metadatum.hpp +++ b/src/metadatum.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file metadatum.hpp diff --git a/src/mn.hpp b/src/mn.hpp index 6f58d66d..8ff60f7b 100644 --- a/src/mn.hpp +++ b/src/mn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file mn.hpp diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 77f0a0d4..daee6402 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * Lens database to decode Exif.Nikon3.LensData * Copyright (C) 2005 Robert Rottmerhusen @@ -19,7 +19,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: nikonmn.cpp diff --git a/src/nikonmn.hpp b/src/nikonmn.hpp index 7dcda084..d5f53e2e 100644 --- a/src/nikonmn.hpp +++ b/src/nikonmn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file nikonmn.hpp diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp index 23204d20..f698884d 100644 --- a/src/olympusmn.cpp +++ b/src/olympusmn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: olympusmn.cpp diff --git a/src/olympusmn.hpp b/src/olympusmn.hpp index cf6bdf47..694a8c58 100644 --- a/src/olympusmn.hpp +++ b/src/olympusmn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file olympusmn.hpp diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp index ba5ecca4..44d62abd 100644 --- a/src/panasonicmn.cpp +++ b/src/panasonicmn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: panasonicmn.cpp diff --git a/src/panasonicmn.hpp b/src/panasonicmn.hpp index 2612044e..bcdeee0b 100644 --- a/src/panasonicmn.hpp +++ b/src/panasonicmn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file panasonicmn.hpp diff --git a/src/rcsid.hpp b/src/rcsid.hpp index 44955aab..b29e29cf 100644 --- a/src/rcsid.hpp +++ b/src/rcsid.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file rcsid.hpp diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp index cead1c71..335de3dd 100644 --- a/src/sigmamn.cpp +++ b/src/sigmamn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: sigmamn.cpp diff --git a/src/sigmamn.hpp b/src/sigmamn.hpp index c244d48d..72e3a094 100644 --- a/src/sigmamn.hpp +++ b/src/sigmamn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file sigmamn.hpp diff --git a/src/sonymn.cpp b/src/sonymn.cpp index 8b6f10d6..cf2fc956 100644 --- a/src/sonymn.cpp +++ b/src/sonymn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: sonymn.cpp diff --git a/src/sonymn.hpp b/src/sonymn.hpp index 45e15d2b..b31cd86a 100644 --- a/src/sonymn.hpp +++ b/src/sonymn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2005 Andreas Huggel + * Copyright (C) 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file sonymn.hpp diff --git a/src/tags.cpp b/src/tags.cpp index ff7468f0..d1171424 100644 --- a/src/tags.cpp +++ b/src/tags.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: tags.cpp diff --git a/src/tags.hpp b/src/tags.hpp index 3efaf9e0..fbb5d0f3 100644 --- a/src/tags.hpp +++ b/src/tags.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file tags.hpp diff --git a/src/types.cpp b/src/types.cpp index 18eb9874..2f4d2b19 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: types.cpp diff --git a/src/types.hpp b/src/types.hpp index 74c21186..22665253 100644 --- a/src/types.hpp +++ b/src/types.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file types.hpp diff --git a/src/utils.cpp b/src/utils.cpp index 7a58ba22..d6d6bb0c 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: utils.cpp diff --git a/src/utils.hpp b/src/utils.hpp index 42b4112f..95be2bf8 100644 --- a/src/utils.hpp +++ b/src/utils.hpp @@ -1,6 +1,6 @@ // ********************************************************* -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file utils.hpp diff --git a/src/value.cpp b/src/value.cpp index f38c3cda..a7b2e41d 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /* File: value.cpp diff --git a/src/value.hpp b/src/value.hpp index 80602082..2bffab2f 100644 --- a/src/value.hpp +++ b/src/value.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004, 2005 Andreas Huggel + * Copyright (C) 2004, 2005, 2006 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -16,7 +16,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ /*! @file value.hpp diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 2c6dad38..4c0931ef 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -3,10 +3,23 @@ tmp/ Exiv2 version ------------------------------------------------------------ ../../src/exiv2 -Exiv2 0.8, Copyright (C) 2004, 2005 Andreas Huggel. +Exiv2 0.8 +Copyright (C) 2004, 2005, 2006 Andreas Huggel. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +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 Exiv2 help --------------------------------------------------------------- Usage: exiv2 [ options ] [ action ] file ...