Commit 32d7562b authored by Boudewijn Rempt's avatar Boudewijn Rempt

zlib is required, so we don't have to check whether it is present

parent 4b0459c7
......@@ -297,10 +297,7 @@ set(CALLIGRA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/krita)
###########################
find_package(ZLIB REQUIRED)
macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
find_package(PNG REQUIRED)
if (APPLE)
# this is not added correctly on OSX -- see http://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242
include_directories(${PNG_INCLUDE_DIR})
......
add_subdirectory(tests)
configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
include_directories(${ZLIB_INCLUDE_DIR})
include_directories(${CMAKE_BINARY_DIR}/krita/libpsd) #For kispsd_include.h
......
/* Defines if your system has the Zlib library */
#cmakedefine HAVE_ZLIB 1
......@@ -39,9 +39,7 @@
#include "kis_iterator_ng.h"
#include "config_psd.h"
#ifdef HAVE_ZLIB
#include "zlib.h"
#endif
namespace PsdPixelUtils {
......@@ -274,7 +272,6 @@ typedef quint8 Bytef;
psd_status psd_unzip_without_prediction(psd_uchar *src_buf, psd_int src_len,
psd_uchar *dst_buf, psd_int dst_len)
{
#ifdef HAVE_ZLIB
z_stream stream;
psd_int state;
......@@ -301,10 +298,6 @@ psd_status psd_unzip_without_prediction(psd_uchar *src_buf, psd_int src_len,
return 0;
return 1;
#endif /* HAVE_ZLIB */
return 0;
}
psd_status psd_unzip_with_prediction(psd_uchar *src_buf, psd_int src_len,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment