[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:45 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9a061d8
The following commit has been merged in the master branch:
commit 9a061d895eb105b942c9328811a3a4d4796bf509
Author: Robin Mills <robin at clanmills.com>
Date: Sat Aug 20 09:43:34 2016 +0000
#1199 Fix WebP printStructure(), readMetadata() and doWriteMetadata() to handle payload padding byte. Extended webp-test to cover -iX, -ix and -ie
---
include/exiv2/webpimage.hpp | 2 +
src/webpimage.cpp | 204 +++++++++++++++++++-------------------------
test/data/webp-test.out | 59 +++++++++++++
test/webp-test.sh | 26 +++---
4 files changed, 157 insertions(+), 134 deletions(-)
diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index b606269..093cf72 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -108,6 +108,8 @@ namespace Exiv2 {
private:
int streamType_;
+ const int TAG_SIZE;
+
}; //Class WebPImage
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index c2bd263..19c695a 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*
- File: webpimage.cpp
- Version: $Rev: 3845 $
- Author(s): Ben Touchette <draekko.software+exiv2 at gmail.com>
- History: 10-Aug-16
- Credits: See header file
+ File: webpimage.cpp
+ Version: $Rev: 3845 $
+ Author(s): Ben Touchette <draekko.software+exiv2 at gmail.com>
+ History: 10-Aug-16
+ Credits: See header file
*/
// *****************************************************************************
#include "rcsid_int.hpp"
@@ -58,13 +58,14 @@
namespace Exiv2 {
namespace Internal {
-}} // namespace Internal, Exiv2
+ }} // namespace Internal, Exiv2
namespace Exiv2 {
using namespace Exiv2::Internal;
WebPImage::WebPImage(BasicIo::AutoPtr io)
- : Image(ImageType::webp, mdNone, io)
+ : Image(ImageType::webp, mdNone, io)
+ , TAG_SIZE(4)
{
} // WebPImage::WebPImage
@@ -113,31 +114,31 @@ namespace Exiv2 {
std::cout << "Writing metadata" << std::endl;
#endif
- byte data[12];
- DataBuf chunkId(5);
- const int TAG_SIZE = 4;
- chunkId.pData_[4] = '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list