[Libreoffice-commits] core.git: vcl/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 17 21:53:10 UTC 2019


 vcl/source/filter/jpeg/Exif.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b59a691d2f6b0d1b94ec68fa01768325e4a34dc9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 17 19:07:27 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jun 17 23:52:13 2019 +0200

    Fix comments about endian-ness
    
    ...which had been added with 256825346ef710d8ef111d7d75535af8a3c5426e "swap if
    the host endianness doesn't match the file formats", but apparently the wrong
    way around.  Intel is little-endian while Motorola is big-endian, which also
    matches the later code that sets bSwap to true for bIntel (i.e., little-endian)
    in case of OSL_BIGENDIAN and for bMotorola (i.e. big-endian) in case of
    !OSL_BIGENDIAN.
    
    Change-Id: I0def56b95228310694d623d4a1a58eab84ce27c8
    Reviewed-on: https://gerrit.libreoffice.org/74184
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index ab2e83f20060..3b014f6deb1d 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -215,8 +215,8 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 aSectionLength, bool bSetVa
 
     TiffHeader* aTiffHeader = reinterpret_cast<TiffHeader*>(&aExifData[0]);
 
-    bool bIntel = aTiffHeader->byteOrder == 0x4949;      //big-endian
-    bool bMotorola = aTiffHeader->byteOrder == 0x4D4D;   //little-endian
+    bool bIntel = aTiffHeader->byteOrder == 0x4949;      //little-endian
+    bool bMotorola = aTiffHeader->byteOrder == 0x4D4D;   //big-endian
 
     if (!bIntel && !bMotorola)
     {


More information about the Libreoffice-commits mailing list