Revert moving to zlib-ng (NVIDIA#3683)

- Reverts zlib-ng as it leads to random failures of PNG and TIFF decoding. Signed-off-by: Janusz Lisiecki [email protected]
WalkingWoo · Feb 17, 2022 · cd794e5 · cd794e5
1 parent aeb61f8
commit cd794e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DALI_DEPS_VERSION b/DALI_DEPS_VERSION
@@ -1 +1 @@
-230e185f95fa283efb904b28d9f130569a3d715b
+03629289faf0ea52e30669b79b1aa8e99b4b2627
diff --git a/cmake/Dependencies.common.cmake b/cmake/Dependencies.common.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ if (BUILD_OPENCV)
   include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
   list(APPEND DALI_LIBS ${OpenCV_LIBRARIES})
   message("OpenCV libraries: ${OpenCV_LIBRARIES}")
-  list(APPEND DALI_EXCLUDES libopencv_core.a;libopencv_imgproc.a;libopencv_highgui.a;libopencv_imgcodecs.a;liblibwebp.a;libittnotify.a;libpng.a;liblibtiff.a;liblibjasper.a;libIlmImf.a;liblibjpeg-turbo.a;libz.a)
+  list(APPEND DALI_EXCLUDES libopencv_core.a;libopencv_imgproc.a;libopencv_highgui.a;libopencv_imgcodecs.a;liblibwebp.a;libittnotify.a;libpng.a;liblibtiff.a;liblibjasper.a;libIlmImf.a;liblibjpeg-turbo.a)
 endif()
 
 ##################################################################
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		230e185f95fa283efb904b28d9f130569a3d715b
		03629289faf0ea52e30669b79b1aa8e99b4b2627