[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:04 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=adb618f
The following commit has been merged in the master branch:
commit adb618fcf9543e840bf73729ecedff1746ef9616
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Mar 19 14:56:47 2005 +0000
More clean-up, updated component dependency graph
---
doc/exiv2.dot | 86 +++++++++++---------
doc/exiv2.gif | Bin 6729 -> 8795 bytes
src/exif.cpp | 89 +++++++++++----------
src/exif.hpp | 5 +-
test/data/{write-test.out => write-test-debug.out} | 0
test/data/write-test.out | 11 ---
6 files changed, 97 insertions(+), 94 deletions(-)
diff --git a/doc/exiv2.dot b/doc/exiv2.dot
index dd174cc..4c60f8c 100644
--- a/doc/exiv2.dot
+++ b/doc/exiv2.dot
@@ -3,52 +3,64 @@
# Version : $Rev$
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History : 18-Feb-04, ahu: created
+# 19-Mar-05, ahu: updated after inside-out change
#
# Description:
-# Dot file for a graph showing the component dependencies of the
-# Exiv2 library. Run the following command to get the image:
+# Dot file for a graph showing the component dependencies ("uses in the
+# interface") of the Exiv2 library.
+# Run the following command to get the image:
# $ dot -Tgif -oexiv2.gif exiv2.dot
################################################################################
-digraph G {
+digraph "Exiv2 component dependencies" {
-L1 [shape=plaintext] ;
-L2 [shape=plaintext] ;
-L3 [shape=plaintext] ;
-L4 [shape=plaintext] ;
-L5 [shape=plaintext] ;
+ L1 [shape=plaintext] ;
+ L2 [shape=plaintext] ;
+ L3 [shape=plaintext] ;
+ L4 [shape=plaintext] ;
+ L5 [shape=plaintext] ;
+ L6 [shape=plaintext] ;
-"L5" -> "L4" -> "L3" -> "L2" -> "L1" [style=invis] ;
+ "L6" -> "L5" -> "L4" -> "L3" -> "L2" -> "L1" [style=invis] ;
-"exif" [shape=box] ;
-"iptc" [shape=box] ;
-"metadatum" [shape=box] ;
-"ifd" [shape=box] ;
-"image" [shape=box] ;
-"tags" [shape=box] ;
-"datasets" [shape=box] ;
-"value" [shape=box] ;
-"types" [shape=box] ;
-"error" [shape=box] ;
-"makernote" [shape=box] ;
+ "exif" [shape=box] ;
+ "iptc" [shape=box] ;
+ "metadatum" [shape=box] ;
+ "ifd" [shape=box] ;
+ "image" [shape=box] ;
+ "tags" [shape=box] ;
+ "datasets" [shape=box] ;
+ "value" [shape=box] ;
+ "types" [shape=box] ;
+ "error" [shape=box] ;
+ "makernote" [shape=box] ;
+ "basicio" [shape=box] ;
+ "*mn" [shape=box] ;
+ "jpgimage" [shape=box] ;
-"exif" -> "tags" ;
-"exif" -> "makernote" ;
-"exif" -> "image" ;
-"iptc" -> "datasets" ;
-"iptc" -> "image" ;
-"metadatum" -> "value" ;
-"metadatum" -> "error" ;
-"makernote" -> "ifd" ;
-"makernote" -> "value" ;
-"ifd" -> "error" ;
-"ifd" -> "types" ;
-"image" -> "types" ;
-"tags" -> "metadatum";
-"datasets" -> "metadatum" ;
-"value" -> "types" ;
+ clusterrank="local";
+ "basicio" -> "error"
+ "basicio" -> "types"
+ "*mn" -> "makernote"
+ "*mn" -> "tags"
+ "datasets" -> "metadatum"
+ "exif" -> "ifd"
+ "exif" -> "tags"
+ "exif" -> "error"
+ "ifd" -> "types"
+ "image" -> "basicio"
+ "iptc" -> "datasets"
+ "iptc" -> "error"
+ "jpgimage" -> "exif"
+ "jpgimage" -> "image"
+ "jpgimage" -> "iptc"
+ "makernote" -> "ifd"
+ "metadatum" -> "value"
+ "tags" -> "metadatum"
+ "value" -> "types"
-{ rank=same; L1 error types }
-{ rank=same; L2 image value ifd }
+ { rank=same; L1 "types" }
+ { rank=same; L2 "value" "ifd" }
+ { rank=same; L5 "image" "iptc" }
}
diff --git a/doc/exiv2.gif b/doc/exiv2.gif
index 8549f80..f3bf7c0 100644
Binary files a/doc/exiv2.gif and b/doc/exiv2.gif differ
diff --git a/src/exif.cpp b/src/exif.cpp
index 6fb6987..b0d2072 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -308,14 +308,14 @@ namespace Exiv2 {
ExifData::ExifData()
: pTiffHeader_(0),
pIfd0_(0), pExifIfd_(0), pIopIfd_(0), pGpsIfd_(0), pIfd1_(0),
- size_(0), pData_(0), compatible_(true)
+ pMakerNote_(0), size_(0), pData_(0), compatible_(true)
{
}
ExifData::ExifData(const ExifData& rhs)
: exifMetadata_(rhs.exifMetadata_), pTiffHeader_(0),
pIfd0_(0), pExifIfd_(0), pIopIfd_(0), pGpsIfd_(0), pIfd1_(0),
- size_(0), pData_(0), compatible_(rhs.compatible_)
+ pMakerNote_(0), size_(0), pData_(0), compatible_(rhs.compatible_)
{
pData_ = new byte[rhs.size_];
size_ = rhs.size_;
@@ -324,10 +324,6 @@ namespace Exiv2 {
if (rhs.pTiffHeader_) {
pTiffHeader_ = new TiffHeader(*rhs.pTiffHeader_);
}
- if (rhs.makerNote_.get() != 0) {
- makerNote_ = rhs.makerNote_->clone();
- makerNote_->updateBase(pData_);
- }
if (rhs.pIfd0_) {
pIfd0_ = new Ifd(*rhs.pIfd0_);
pIfd0_->updateBase(pData_);
@@ -348,6 +344,10 @@ namespace Exiv2 {
pIfd1_ = new Ifd(*rhs.pIfd1_);
pIfd1_->updateBase(pData_);
}
+ if (rhs.pMakerNote_) {
+ pMakerNote_ = rhs.pMakerNote_->clone().release();
+ pMakerNote_->updateBase(pData_);
+ }
}
ExifData::~ExifData()
@@ -358,6 +358,7 @@ namespace Exiv2 {
delete pIopIfd_;
delete pGpsIfd_;
delete pIfd1_;
+ delete pMakerNote_;
delete[] pData_;
}
@@ -378,13 +379,6 @@ namespace Exiv2 {
if (rhs.pTiffHeader_) {
pTiffHeader_ = new TiffHeader(*rhs.pTiffHeader_);
}
-
- makerNote_.reset();
- if (rhs.makerNote_.get() != 0) {
- makerNote_ = rhs.makerNote_->clone();
- makerNote_->updateBase(pData_);
- }
-
delete pIfd0_;
pIfd0_ = 0;
if (rhs.pIfd0_) {
@@ -415,6 +409,12 @@ namespace Exiv2 {
pIfd1_ = new Ifd(*rhs.pIfd1_);
pIfd1_->updateBase(pData_);
}
+ delete pMakerNote_;
+ pMakerNote_ = 0;
+ if (rhs.pMakerNote_) {
+ pMakerNote_ = rhs.pMakerNote_->clone().release();
+ pMakerNote_->updateBase(pData_);
+ }
compatible_ = rhs.compatible_;
return *this;
@@ -471,30 +471,31 @@ namespace Exiv2 {
MakerNoteFactory& mnf = MakerNoteFactory::instance();
// Todo: The conversion to string assumes that there is a
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list