[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:23 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7758094
The following commit has been merged in the master branch:
commit 77580944ca245502cabfc6de8b6112801449336c
Author: Robin Mills <robin at clanmills.com>
Date: Sun Sep 2 22:45:50 2012 +0000
Fix submitted: Issue #845. See: http://dev.exiv2.org/issues/845
---
src/matroskavideo.cpp | 4 ++--
src/matroskavideo.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
index e86cfcc..7f32c72 100644
--- a/src/matroskavideo.cpp
+++ b/src/matroskavideo.cpp
@@ -524,7 +524,7 @@ namespace Exiv2 {
return;
}
- uint sz = findBlockSize(buf[0]); // 0-8
+ uint32_t sz = findBlockSize(buf[0]); // 0-8
if (sz > 0) io_->read(buf + 1, sz - 1);
const MatroskaTags* mt = find(matroskaTags, returnTagValue(buf, sz));
@@ -712,7 +712,7 @@ namespace Exiv2 {
else xmpData_["Xmp.video.AspectRatio"] = aspectRatio;
} // MatroskaVideo::aspectRatio
- uint MatroskaVideo::findBlockSize(byte b)
+ uint32_t MatroskaVideo::findBlockSize(byte b)
{
if (b & 128) return 1;
else if (b & 64) return 2;
diff --git a/src/matroskavideo.hpp b/src/matroskavideo.hpp
index 6bd17af..1f8a4e7 100644
--- a/src/matroskavideo.hpp
+++ b/src/matroskavideo.hpp
@@ -101,7 +101,7 @@ namespace Exiv2 {
@param b The byte, which stores the information to calculate the size
@return Return the size of the block.
*/
- uint findBlockSize(byte b);
+ uint32_t findBlockSize(byte b);
/*!
@brief Check for a valid tag and decode the block at the current IO position.
Calls contentManagement() or skips to next tag, if required.
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list