diff options
Diffstat (limited to 'tiff/contrib')
-rw-r--r-- | tiff/contrib/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/addtiffo/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tiff/contrib/addtiffo/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/addtiffo/tif_ovrcache.c | 1 | ||||
-rw-r--r-- | tiff/contrib/dbs/CMakeLists.txt | 11 | ||||
-rw-r--r-- | tiff/contrib/dbs/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/dbs/xtiff/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/iptcutil/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/mfs/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/pds/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/ras/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/stream/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/tags/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/win_dib/Makefile.in | 4 | ||||
-rw-r--r-- | tiff/contrib/win_dib/tiff2dib.c | 2 |
15 files changed, 42 insertions, 22 deletions
diff --git a/tiff/contrib/Makefile.in b/tiff/contrib/Makefile.in index c4d5cd6e..c0f998b3 100644 --- a/tiff/contrib/Makefile.in +++ b/tiff/contrib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/addtiffo/CMakeLists.txt b/tiff/contrib/addtiffo/CMakeLists.txt index b7482635..45e733cd 100644 --- a/tiff/contrib/addtiffo/CMakeLists.txt +++ b/tiff/contrib/addtiffo/CMakeLists.txt @@ -32,3 +32,9 @@ include_directories(${PROJECT_SOURCE_DIR}/libtiff add_executable(addtiffo addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h) target_link_libraries(addtiffo tiff port) + +if(WEBP_SUPPORT AND EMSCRIPTEN) + # Emscripten is pretty finnicky about linker flags. + # It needs --shared-memory if and only if atomics or bulk-memory is used. + target_link_options(addtiffo PUBLIC "-Wl,--shared-memory") +endif() diff --git a/tiff/contrib/addtiffo/Makefile.in b/tiff/contrib/addtiffo/Makefile.in index abe4c027..31dc815c 100644 --- a/tiff/contrib/addtiffo/Makefile.in +++ b/tiff/contrib/addtiffo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/addtiffo/tif_ovrcache.c b/tiff/contrib/addtiffo/tif_ovrcache.c index 67a88120..ac500ab4 100644 --- a/tiff/contrib/addtiffo/tif_ovrcache.c +++ b/tiff/contrib/addtiffo/tif_ovrcache.c @@ -166,6 +166,7 @@ static void TIFFWriteOvrRow( TIFFOvrCache * psCache ) /* -------------------------------------------------------------------- */ nBaseDirOffset = TIFFCurrentDirOffset( psCache->hTIFF ); nRet = TIFFSetSubDirectory( psCache->hTIFF, psCache->nDirOffset ); + (void) nRet; assert( nRet == 1 ); /* -------------------------------------------------------------------- */ diff --git a/tiff/contrib/dbs/CMakeLists.txt b/tiff/contrib/dbs/CMakeLists.txt index b2e809b2..ff3ce20c 100644 --- a/tiff/contrib/dbs/CMakeLists.txt +++ b/tiff/contrib/dbs/CMakeLists.txt @@ -41,3 +41,14 @@ target_link_libraries(tiff-rgb tiff port) add_subdirectory(xtiff) extra_dist(README) + +if(WEBP_SUPPORT AND EMSCRIPTEN) + # Emscripten is pretty finnicky about linker flags. + # It needs --shared-memory if and only if atomics or bulk-memory is used. + foreach(target tiff-bi + tiff-grayscale + tiff-palette + tiff-rgb) + target_link_options(${target} PUBLIC "-Wl,--shared-memory") + endforeach() +endif() diff --git a/tiff/contrib/dbs/Makefile.in b/tiff/contrib/dbs/Makefile.in index 38a13830..0f44fdd1 100644 --- a/tiff/contrib/dbs/Makefile.in +++ b/tiff/contrib/dbs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/dbs/xtiff/Makefile.in b/tiff/contrib/dbs/xtiff/Makefile.in index 61594863..4be51fd8 100644 --- a/tiff/contrib/dbs/xtiff/Makefile.in +++ b/tiff/contrib/dbs/xtiff/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/iptcutil/Makefile.in b/tiff/contrib/iptcutil/Makefile.in index 790bb6c0..c0cc3959 100644 --- a/tiff/contrib/iptcutil/Makefile.in +++ b/tiff/contrib/iptcutil/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/mfs/Makefile.in b/tiff/contrib/mfs/Makefile.in index 201e700b..0ed2019c 100644 --- a/tiff/contrib/mfs/Makefile.in +++ b/tiff/contrib/mfs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/pds/Makefile.in b/tiff/contrib/pds/Makefile.in index e4c4651d..77b02179 100644 --- a/tiff/contrib/pds/Makefile.in +++ b/tiff/contrib/pds/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/ras/Makefile.in b/tiff/contrib/ras/Makefile.in index 0028f091..dac37b63 100644 --- a/tiff/contrib/ras/Makefile.in +++ b/tiff/contrib/ras/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/stream/Makefile.in b/tiff/contrib/stream/Makefile.in index 481faa82..5f7f1eba 100644 --- a/tiff/contrib/stream/Makefile.in +++ b/tiff/contrib/stream/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/tags/Makefile.in b/tiff/contrib/tags/Makefile.in index 0b53ed76..502d8f05 100644 --- a/tiff/contrib/tags/Makefile.in +++ b/tiff/contrib/tags/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/win_dib/Makefile.in b/tiff/contrib/win_dib/Makefile.in index 7663106d..fa3b2237 100644 --- a/tiff/contrib/win_dib/Makefile.in +++ b/tiff/contrib/win_dib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tiff/contrib/win_dib/tiff2dib.c b/tiff/contrib/win_dib/tiff2dib.c index 475ef304..2fa2de69 100644 --- a/tiff/contrib/win_dib/tiff2dib.c +++ b/tiff/contrib/win_dib/tiff2dib.c @@ -106,6 +106,8 @@ HDIB LoadTIFFinDIB(LPSTR lpFileName) if (lpDIB) lpBits = FindDIBBits((LPSTR) lpDIB); + else + lpBits = NULL; //In the tiff file the lines are save from up to down //In a DIB the lines must be save from down to up |