[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:02 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6749046
The following commit has been merged in the master branch:
commit 6749046e401095f061222a57b7009e535ddbdca6
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Feb 11 06:39:36 2004 +0000
Divided exif.[ch]pp into components
---
src/Makefile | 48 +--
src/actions.cpp | 5 +-
src/error.hpp | 73 ++++
src/exif.cpp | 958 +++-----------------------------------------------
src/exif.hpp | 1008 ++---------------------------------------------------
src/exifprint.cpp | 6 +-
src/exiv2.cpp | 5 +-
src/ifd.cpp | 457 ++++++++++++++++++++++++
src/ifd.hpp | 389 +++++++++++++++++++++
src/image.cpp | 234 +++++++++++++
src/image.hpp | 207 +++++++++++
src/taglist.cpp | 6 +-
src/tags.cpp | 45 +--
src/tags.hpp | 106 +-----
src/types.cpp | 235 +++++++++++++
src/types.hpp | 201 +++++++++++
src/value.cpp | 177 ++++++++++
src/value.hpp | 490 ++++++++++++++++++++++++++
18 files changed, 2579 insertions(+), 2071 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 8aed633..2e63407 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,26 +1,26 @@
-# ***************************************************** -*- Makefile -*-
+# ************************************************************* -*- Makefile -*-
#
# Copyright (C) 2004 Andreas Huggel <ahuggel at gmx.net>
#
# This Makefile 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 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.
+# 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
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#
# File: Makefile
-# Version: $Name: $ $Revision: 1.9 $
+# Version: $Name: $ $Revision: 1.10 $
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History: 10-Dec-03, ahu: created
#
@@ -44,14 +44,14 @@ all: lib bin
top_srcdir = ..
include $(top_srcdir)/config.mk
-# **********************************************************************
+# ******************************************************************************
# Source files
# Add standalone C++ header files to this list
-CCHDR = rcsid.hpp
+CCHDR = rcsid.hpp error.hpp
# Add library C++ source files to this list
-CCSRC = exif.cpp tags.cpp utils.cpp
+CCSRC = exif.cpp ifd.cpp image.cpp tags.cpp types.cpp value.cpp
# Add source files of simple applications to this list
BINSRC = example1.cpp taglist.cpp exifprint.cpp exiftest.cpp
@@ -60,22 +60,22 @@ BINSRC = example1.cpp taglist.cpp exifprint.cpp exiftest.cpp
EXIV2MAIN = exiv2.cpp
# Add additional source files of the real application to this list
-EXIV2SRC = actions.cpp
+EXIV2SRC = actions.cpp utils.cpp
-# **********************************************************************
+# ******************************************************************************
# Library
LIBNAME = exiv2
-# **********************************************************************
+# ******************************************************************************
# Defines, Includes and Libraries
CXXDEFS = $(DEFS)
CXXINCS = $(INCS)
LDLIBS = $(LIBS) -l$(LIBNAME)
-# **********************************************************************
-# ======================================================================
-# **********************************************************************
+# ******************************************************************************
+# ==============================================================================
+# ******************************************************************************
# Initialisations
SHELL = /bin/sh
@@ -106,7 +106,7 @@ EXIV2BIN = $(EXIV2MAIN:.cpp=)
ARCHIVE = lib$(LIBNAME)$(ARCHIVE_SUFFIX)
SHAREDLIB = lib$(LIBNAME)$(SHAREDLIB_SUFFIX)
-# **********************************************************************
+# ******************************************************************************
# Assemble the dependencies for the 'lib' target and corresponding
# (un)install targets. If neither STATIC_LIBS nor SHARED_LIBS is
# defined, 'lib' does nothing.
@@ -123,7 +123,7 @@ ifdef SHARED_LIBS
UNINSTALL_LIB := $(UNINSTALL_LIB) uninstall-sharedlib
endif
-# **********************************************************************
+# ******************************************************************************
# Include `.*.d' files, but only if we need them,
# i.e., if no target was given...
ifeq ($(strip $(MAKECMDGOALS)),)
@@ -138,7 +138,7 @@ ifneq ($(MAKECMDGOALS), $(filter $(MAKECMDGOALS), $(NOINCLUDE)))
endif
endif
-# **********************************************************************
+# ******************************************************************************
# Rules
%.o: %.cpp
$(CXX) $(CXXFLAGS_STATIC) $(CXXDEFS) $(CXXINCS) -c $< -o $@
@@ -166,7 +166,7 @@ $(BINARY): %: %.o
$(EXIV2BIN): %: %.o
$(CXX) $(CXXFLAGS) $(EXIV2OBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
-# **********************************************************************
+# ******************************************************************************
# Targets
.PHONY: all archive sharedlib bin check doc \
clean mostlyclean distclean maintainer-clean \
diff --git a/src/actions.cpp b/src/actions.cpp
index 87a1dec..37f7d42 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,17 +20,16 @@
*/
/*
File: actions.cpp
- Version: $Name: $ $Revision: 1.1 $
+ Version: $Name: $ $Revision: 1.2 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 08-Dec-03, ahu: created
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.1 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.2 $ $RCSfile: actions.cpp,v $")
// *****************************************************************************
// included header files
-
#include "actions.hpp"
#include "exiv2.hpp"
#include "utils.hpp"
diff --git a/src/error.hpp b/src/error.hpp
new file mode 100644
index 0000000..278fd40
--- /dev/null
+++ b/src/error.hpp
@@ -0,0 +1,73 @@
+// ***************************************************************** -*- 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 error.hpp
+ @brief Error class for exceptions
+ @version $Name: $ $Revision: 1.1 $
+ @author Andreas Huggel (ahu)
+ <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
+ @date 15-Jan-04, ahu: created
+ 11-Feb-04, ahu: isolated as a component
+ */
+#ifndef ERROR_HPP_
+#define ERROR_HPP_
+
+// *****************************************************************************
+// included header files
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exif {
+
+// *****************************************************************************
+// class definitions
+
+ /*!
+ @brief Very simple error class used for exceptions. It contains just an
+ error message. An output operator is provided to print
+ errors to a stream.
+ */
+ class Error {
+ public:
+ //! Constructor taking a (short) error message as argument
+ Error(const std::string& message) : message_(message) {}
+ /*!
+ @brief Return the error message. Consider using the output operator
+ operator<<(std::ostream &os, const Error& error) instead.
+ */
+ std::string message() const { return message_; }
+ private:
+ std::string message_;
+ };
+
+ //! %Error output operator
+ inline std::ostream& operator<<(std::ostream& os, const Error& error)
+ {
+ return os << error.message();
+ }
+
+} // namespace Exif
+
+#endif // #ifndef ERROR_HPP_
diff --git a/src/exif.cpp b/src/exif.cpp
index c5f5578..8977a4e 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,18 +20,24 @@
*/
/*
File: exif.cpp
- Version: $Name: $ $Revision: 1.19 $
+ Version: $Name: $ $Revision: 1.20 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
+ 11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.19 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.20 $ $RCSfile: exif.cpp,v $")
// *****************************************************************************
// included header files
#include "exif.hpp"
+#include "types.hpp"
+#include "error.hpp"
+#include "value.hpp"
+#include "ifd.hpp"
#include "tags.hpp"
+#include "image.hpp"
// + standard includes
#include <iostream>
@@ -41,334 +47,12 @@ EXIV2_RCSID("@(#) $Name: $ $Revision: 1.19 $ $RCSfile: exif.cpp,v $")
#include <utility>
#include <algorithm>
#include <map>
-
#include <cstring>
-#include <cstdio> // for rename
-
-#include <sys/types.h> // for getpid
-#include <unistd.h> // for getpid, unlink
// *****************************************************************************
// class member definitions
namespace Exif {
- JpegImage::JpegImage()
- : sizeExifData_(0), exifData_(0)
- {
- }
-
- JpegImage::~JpegImage()
- {
- delete[] exifData_;
- }
-
- const uint16 JpegImage::soi_ = 0xffd8;
- const uint16 JpegImage::app0_ = 0xffe0;
- const uint16 JpegImage::app1_ = 0xffe1;
- const char JpegImage::exifId_[] = "Exif
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list