[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:35:58 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a4a95c0
The following commit has been merged in the master branch:
commit a4a95c0aec54c24fc675a040a6946f5b0817d151
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Feb 2 02:44:26 2004 +0000
Added RCS id to each *.cpp file
---
src/Makefile | 4 ++--
src/example1.cpp | 6 +++++-
src/exif.cpp | 11 ++++++++---
src/exifprint.cpp | 6 +++++-
src/exiftest.cpp | 6 +++++-
src/rcsid.hpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
src/tags.cpp | 6 +++++-
src/utils.cpp | 13 ++++++++-----
src/utiltest.cpp | 6 +++++-
9 files changed, 92 insertions(+), 15 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 2a4f019..c4d087b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,7 @@
#
# RCS information
# $Name: $
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
# Description:
# Do NOT change this file! All system specific settings and configs
@@ -52,7 +52,7 @@ include $(top_srcdir)/config.mk
# Source files
# Add standalone C++ header files to this list
-CCHDR =
+CCHDR = rcsid.hpp
# Add library C++ source files to this list
CCSRC = exif.cpp tags.cpp utils.cpp
diff --git a/src/example1.cpp b/src/example1.cpp
index ca179ce..ccffc03 100644
--- a/src/example1.cpp
+++ b/src/example1.cpp
@@ -22,11 +22,15 @@
Abstract: Sample code to add, modify and delete Exif metadata
File: example1.cpp
- Version: $Name: $ $Revision: 1.1 $
+ Version: $Name: $ $Revision: 1.2 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
*/
// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.2 $ $RCSfile: example1.cpp,v $")
+
+// *****************************************************************************
// included header files
#include "exif.hpp"
#include <iostream>
diff --git a/src/exif.cpp b/src/exif.cpp
index ca64094..612b35d 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,11 +20,15 @@
*/
/*
File: exif.cpp
- Version: $Name: $ $Revision: 1.12 $
+ Version: $Name: $ $Revision: 1.13 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
*/
// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.13 $ $RCSfile: exif.cpp,v $")
+
+// *****************************************************************************
// included header files
#include "exif.hpp"
#include "tags.hpp"
@@ -35,6 +39,7 @@
#include <sstream>
#include <fstream>
#include <utility>
+#include <algorithm>
#include <cstring>
@@ -332,8 +337,8 @@ namespace Exif {
}
Metadatum::Metadatum(const Metadatum& rhs)
- : tag_(rhs.tag_), ifdId_(rhs.ifdId_), ifdIdx_(rhs.ifdIdx_),
- value_(0), key_(rhs.key_)
+ : tag_(rhs.tag_), ifdId_(rhs.ifdId_),
+ ifdIdx_(rhs.ifdIdx_), value_(0), key_(rhs.key_)
{
if (rhs.value_ != 0) value_ = rhs.value_->clone(); // deep copy
}
diff --git a/src/exifprint.cpp b/src/exifprint.cpp
index 0a786a5..de333d3 100644
--- a/src/exifprint.cpp
+++ b/src/exifprint.cpp
@@ -22,10 +22,14 @@
Abstract : Sample program to print the Exif metadata of an image
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
- Version : $Name: $ $Revision: 1.3 $
+ Version : $Name: $ $Revision: 1.4 $
History : 26-Jan-04, ahu: created
*/
// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.4 $ $RCSfile: exifprint.cpp,v $")
+
+// *****************************************************************************
// included header files
#include "exifprint.hpp"
#include "exif.hpp"
diff --git a/src/exiftest.cpp b/src/exiftest.cpp
index b61efd7..35100ff 100644
--- a/src/exiftest.cpp
+++ b/src/exiftest.cpp
@@ -3,9 +3,13 @@
Abstract : This is playground code, do what you want with it.
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
- Version : $Name: $ $Revision: 1.10 $
+ Version : $Name: $ $Revision: 1.11 $
*/
// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.11 $ $RCSfile: exiftest.cpp,v $")
+
+// *****************************************************************************
// included header files
#include "exif.hpp"
#include <iostream>
diff --git a/src/rcsid.hpp b/src/rcsid.hpp
new file mode 100644
index 0000000..fc4ac98
--- /dev/null
+++ b/src/rcsid.hpp
@@ -0,0 +1,49 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004 Andreas Huggel <ahuggel at gmx.net>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+/*!
+ @file rcsid.hpp
+ @brief Define an RCS id string in every file that includes rcsid.hpp.
+
+ This hack has the following purposes:
+ 1. To define the RCS id string variable in the local namespace, so
+ that there won't be any duplicate extern symbols at link time.
+ 2. To avoid warnings of the type "variable declared and never used".
+
+ @version $Name: $ $Revision: 1.1 $
+ @author Andreas Huggel (ahu)
+ <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
+ @date 02-Feb-04, ahu: created
+ */
+#ifndef RCSID_HPP_
+#define RCSID_HPP_
+
+#if !defined (EXIV2_RCSID)
+#define EXIV2_RCSID(id) \
+ namespace { \
+ inline const char* getRcsId(const char*) \
+ { \
+ return id ; \
+ } \
+ const char* rcsId = getRcsId(rcsId); \
+ }
+
+#endif // #if !defined (EXIV2_RCSID)
+#endif // #ifndef RCSID_HPP_
diff --git a/src/tags.cpp b/src/tags.cpp
index cbb8fa7..3bb0d6a 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,11 +20,15 @@
*/
/*
File: tags.cpp
- Version: $Name: $ $Revision: 1.7 $
+ Version: $Name: $ $Revision: 1.8 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 15-Jan-04, ahu: created
*/
// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.8 $ $RCSfile: tags.cpp,v $")
+
+// *****************************************************************************
// included header files
#include "tags.hpp"
diff --git a/src/utils.cpp b/src/utils.cpp
index d550827..43c9a2e 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,4 +1,4 @@
-// ********************************************************** -*- C++ -*-
+// ***************************************************************** -*- C++ -*-
/*
* Copyright (C) 2004 Andreas Huggel <ahuggel at gmx.net>
*
@@ -20,12 +20,15 @@
*/
/*
File: utils.cpp
- Version: $Name: $ $Revision: 1.4 $
+ Version: $Name: $ $Revision: 1.5 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 08-Dec-03, ahu: created
*/
+// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.5 $ $RCSfile: utils.cpp,v $")
-// *********************************************************************
+// *****************************************************************************
// included header files
#include "utils.hpp"
@@ -43,7 +46,7 @@
namespace Util {
-// *********************************************************************
+// *****************************************************************************
// class Getopt
int Getopt::getopt(int argc, char* const argv[], const std::string& optstring)
{
@@ -60,7 +63,7 @@ int Getopt::getopt(int argc, char* const argv[], const std::string& optstring)
return errcnt_;
}
-// *********************************************************************
+// *****************************************************************************
// free functions
bool fileExists(const std::string& path, bool ct)
diff --git a/src/utiltest.cpp b/src/utiltest.cpp
index c208864..81d1517 100644
--- a/src/utiltest.cpp
+++ b/src/utiltest.cpp
@@ -6,9 +6,13 @@
RCS information
$Name: $
- $Revision: 1.1 $
+ $Revision: 1.2 $
*/
+// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.2 $ $RCSfile: utiltest.cpp,v $")
+
// *********************************************************************
// included header files
#include "utils.hpp"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list