[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:22 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=27ef590
The following commit has been merged in the master branch:
commit 27ef590773b6d743f6b0fdb57d3716a1d84ebf22
Author: Robin Mills <robin at clanmills.com>
Date: Tue Sep 16 08:20:18 2014 +0000
Roll-back for 3355 (GSoC2013 video write code). Regrettably, this appears to cause all MSVC build to fail our test harness. I'll deal with the video13 code in a different branch.
---
src/actions.hpp | 86 +-
src/asfvideo.cpp | 67 +-
src/asfvideo.hpp | 12 +-
src/error.hpp | 18 -
src/image.cpp | 4 +-
src/matroskavideo.cpp | 1523 +++++++++-----------
src/matroskavideo.hpp | 162 +--
src/quicktimevideo.cpp | 3760 ++++++++++++++++--------------------------------
src/quicktimevideo.hpp | 295 ++--
src/riffvideo.cpp | 1774 ++++++++---------------
src/riffvideo.hpp | 303 ++--
src/tags_int.hpp | 12 -
src/types.cpp | 9 +-
src/types.hpp | 9 +-
src/version.hpp | 1 -
src/xmp.cpp | 2 -
16 files changed, 2753 insertions(+), 5284 deletions(-)
diff --git a/src/actions.hpp b/src/actions.hpp
index 1cf8d27..bf0c854 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -159,11 +159,7 @@ namespace Action {
public:
virtual ~Print();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Print> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Print> AutoPtr;
AutoPtr clone() const;
//! Print the Jpeg comment
@@ -216,18 +212,10 @@ namespace Action {
public:
virtual ~Rename();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Rename> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Rename> AutoPtr;
AutoPtr clone() const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual Rename* clone_() const;
}; // class Rename
@@ -236,18 +224,10 @@ namespace Action {
public:
virtual ~Adjust();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Adjust> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Adjust> AutoPtr;
AutoPtr clone() const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual Adjust* clone_() const;
int adjustDateTime(Exiv2::ExifData& exifData,
const std::string& key,
@@ -267,11 +247,7 @@ namespace Action {
public:
virtual ~Erase();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Erase> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Erase> AutoPtr;
AutoPtr clone() const;
/*!
@@ -296,12 +272,8 @@ namespace Action {
int eraseXmpData(Exiv2::Image* image) const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual Erase* clone_() const;
- std::string path_; //!< TODO
+ std::string path_;
}; // class Erase
@@ -312,11 +284,7 @@ namespace Action {
public:
virtual ~Extract();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Extract> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Extract> AutoPtr;
AutoPtr clone() const;
/*!
@@ -339,12 +307,8 @@ namespace Action {
void writePreviewFile(const Exiv2::PreviewImage& pvImg, int num) const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual Extract* clone_() const;
- std::string path_; //!< TODO
+ std::string path_;
}; // class Extract
@@ -355,11 +319,7 @@ namespace Action {
public:
virtual ~Insert();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Insert> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Insert> AutoPtr;
AutoPtr clone() const;
/*!
@@ -388,11 +348,7 @@ namespace Action {
public:
virtual ~Modify();
virtual int run(const std::string& path);
- typedef std::auto_ptr<Modify> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<Modify> AutoPtr;
AutoPtr clone() const;
Modify() {}
//! Apply modification commands to the \em pImage, return 0 if successful.
@@ -425,20 +381,12 @@ namespace Action {
public:
virtual ~FixIso();
virtual int run(const std::string& path);
- typedef std::auto_ptr<FixIso> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<FixIso> AutoPtr;
AutoPtr clone() const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual FixIso* clone_() const;
- std::string path_; //!< TODO
+ std::string path_;
}; // class FixIso
@@ -451,20 +399,12 @@ namespace Action {
public:
virtual ~FixCom();
virtual int run(const std::string& path);
- typedef std::auto_ptr<FixCom> AutoPtr; //!< TODO
- /*!
- * rief clone TODO
- *
eturn
- */
+ typedef std::auto_ptr<FixCom> AutoPtr;
AutoPtr clone() const;
private:
- /*!
- * rief clone TODO
- *
eturn
- */
virtual FixCom* clone_() const;
- std::string path_; //!< TODO
+ std::string path_;
}; // class FixCom
diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index 29e14de..e296a0b 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -160,7 +160,6 @@ namespace Exiv2 {
{ 0x7A22, "GSM-AMR (VBR including SID)" }
};
- //! File properties.
extern const TagDetails filePropertiesTags[] = {
{ 7, "Xmp.video.FileLength" },
{ 6, "Xmp.video.CreationDate" },
@@ -171,7 +170,6 @@ namespace Exiv2 {
{ 1, "Xmp.video.MaxBitRate" }
};
- //!Contents Description.
extern const TagDetails contentDescriptionTags[] = {
{ 0, "Xmp.video.Title" },
{ 1, "Xmp.video.Author" },
@@ -295,37 +293,11 @@ namespace Exiv2 {
using namespace Exiv2::Internal;
- class AsfVideo::Private
- {
- public:
- Private()
- {
- continueTraversing_ = true;
- localPosition_ = 1;
- streamNumber_ = 0;
- height_ = 1;
- width_ = 1;
- }
- //! Variable to check the end of metadata traversing.
- bool continueTraversing_;
- //! Variable which stores current position of the read pointer.
- uint64_t localPosition_;
- //! Variable which stores current stream being processsed.
- int streamNumber_;
- //! Variable to store height and width of a video frame.
- uint64_t height_, width_;
- };
-
AsfVideo::AsfVideo(BasicIo::AutoPtr io)
- : Image(ImageType::asf, mdNone, io),d(new Private)
+ : Image(ImageType::asf, mdNone, io)
{
} // AsfVideo::AsfVideo
- AsfVideo::~AsfVideo()
- {
- delete d;
- }
-
std::string AsfVideo::mimeType() const
{
return "video/asf";
@@ -347,15 +319,15 @@ namespace Exiv2 {
IoCloser closer(*io_);
clearMetadata();
- d->continueTraversing_ = true;
+ continueTraversing_ = true;
io_->seek(0, BasicIo::beg);
- d->height_ = d->width_ = 1;
+ height_ = width_ = 1;
xmpData_["Xmp.video.FileSize"] = (double)io_->size()/(double)1048576;
xmpData_["Xmp.video.FileName"] = io_->path();
xmpData_["Xmp.video.MimeType"] = mimeType();
- while (d->continueTraversing_) decodeBlock();
+ while (continueTraversing_) decodeBlock();
aspectRatio();
} // AsfVideo::readMetadata
@@ -365,6 +337,7 @@ namespace Exiv2 {
const long bufMinSize = 9;
DataBuf buf(bufMinSize);
unsigned long size = 0;
+ buf.pData_[8] = '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list