fix: invalid watermark crashes sipi (#406)

dasch-swiss · Jan 24, 2024 · 39dc0e8 · 39dc0e8
1 parent 4e0d50f
commit 39dc0e8
Show file tree

Hide file tree

Showing 12 changed files with 792 additions and 715 deletions.
diff --git a/ext/zlib/CMakeLists.txt b/ext/zlib/CMakeLists.txt
@@ -14,11 +14,11 @@ endif()
 
 ExternalProject_Add(project_zlib
         INSTALL_DIR ${COMMON_LOCAL}
-        URL http://zlib.net/zlib-1.3.tar.gz
+        URL http://zlib.net/zlib-1.3.1.tar.gz
         DOWNLOAD_DIR ${COMMON_SRCS}/downloads
         ${timestamp_policy}
-        SOURCE_DIR ${COMMON_SRCS}/zlib-1.2.13
-        CONFIGURE_COMMAND ${COMMON_SRCS}/zlib-1.2.13/configure
+        SOURCE_DIR ${COMMON_SRCS}/zlib
+        CONFIGURE_COMMAND ${COMMON_SRCS}/zlib/configure
             --prefix=${COMMON_LOCAL}
             --static
             # --shared

diff --git a/include/SipiImage.h b/include/SipiImage.h
@@ -567,9 +567,9 @@ class SipiImageError : public std::exception {
         /*!
          * Add a watermark to a file...
          *
-         * \param[in] wmfilename Path to watermakfile (which must be a TIFF file at the moment)
+         * \param[in] wmfilename Path to watermarkfile (which must be a TIFF file at the moment)
          */
-        bool add_watermark(const std::string &wmfilename);
+        void add_watermark(const std::string &wmfilename);
 
 
         /*!