[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:16 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d41c4fc

The following commit has been merged in the master branch:
commit d41c4fcaab52e79dff36074a5fbcd57ae1f2206b
Author: Robin Mills <robin at clanmills.com>
Date:   Sat May 2 14:53:44 2015 +0000

    #1072 #922 BigEndian (Motorola PowerPC) fix.
---
 src/tiffimage.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 4e5c1fc..3d4ec32 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -530,7 +530,15 @@ namespace Exiv2 {
                             }
                         } else if ( isRationalType(type) ){
                             for ( uint16_t k = 0 ; k < kount ; k++ ) {
-                                out << sp << byteSwap2(buf,k*size+(bSwap?2:0),bSwap) << "/" << byteSwap2(buf,k*size+(bSwap?0:2),bSwap);
+                            	uint16_t a = byteSwap2(buf,k*size+0,bSwap);
+                            	uint16_t b = byteSwap2(buf,k*size+2,bSwap);
+                            	if ( isLittleEndian() ) {
+                                	if ( bSwap ) out << sp << b << "/" << a;
+                                	else         out << sp << a << "/" << b;
+                                } else {
+                                	if ( bSwap ) out << sp << a << "/" << b;
+                                	else         out << sp << b << "/" << a;
+                                }
                                 sp = " ";
                             }
                         } else if ( isStringType(type) ) {

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list