[PATCH 0/2] MR8083: windowscodecs/tiff: Remove remaining endianess compiler checks.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8083

[PATCH 1/2] windowscodecs/tiff: Remove remaining endianess compiler checks.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/windowscodecs/libtiff.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c
index cc66339a7e0..4ff00ded1b6 100644
--- a/dlls/windowscodecs/libtiff.c
+++ b/dlls/windowscodecs/libtiff.c
@@ -1164,7 +1164,6 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface,
 {
     struct tiff_decoder *This = impl_from_decoder(iface);
     HRESULT hr;
-    BOOL byte_swapped;
     struct decoder_block result;
 
     hr = tiff_decoder_select_frame(This, frame);
@@ -1176,12 +1175,7 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface,
     result.offset = TIFFCurrentDirOffset(This->tiff);
     result.length = 0;
 
-    byte_swapped = TIFFIsByteSwapped(This->tiff);
-#ifdef WORDS_BIGENDIAN
-    result.options = byte_swapped ? WICPersistOptionLittleEndian : WICPersistOptionBigEndian;
-#else
-    result.options = byte_swapped ? WICPersistOptionBigEndian : WICPersistOptionLittleEndian;
-#endif
+    result.options = TIFFIsByteSwapped(This->tiff) ? WICPersistOptionBigEndian : WICPersistOptionLittleEndian;
     result.options |= WICPersistOptionNoCacheStream|DECODER_BLOCK_FULL_STREAM|DECODER_BLOCK_READER_CLSID;
     result.reader_clsid = CLSID_WICIfdMetadataReader;
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8083

[PATCH 2/2] windowscodecs/metadata: Remove remaining endianess compiler checks.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/windowscodecs/metadatahandler.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index 8f3c19e3aca..c27a055b60b 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -1406,17 +1406,12 @@ static HRESULT load_ifd_metadata_internal(MetadataHandler *handler, IStream *inp
     MetadataItem *result;
     USHORT count, i;
     struct IFD_entry *entry;
-    BOOL native_byte_order = TRUE;
+    BOOL native_byte_order;
     ULONG bytesread;
 
     TRACE("\n");
 
-#ifdef WORDS_BIGENDIAN
-    if (persist_options & WICPersistOptionLittleEndian)
-#else
-    if (persist_options & WICPersistOptionBigEndian)
-#endif
-        native_byte_order = FALSE;
+    native_byte_order = !(persist_options & WICPersistOptionBigEndian);
 
     hr = IStream_Read(input, &count, sizeof(count), &bytesread);
     if (bytesread != sizeof(count)) hr = E_FAIL;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8083

[PATCH 0/2] MR8083: windowscodecs/tiff: Remove remaining endianess compiler checks. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8083