blob: cd8be16073294c9349c72efacf29e78a86b6daf5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -430,70 +430,9 @@
endif()
if (DLIB_PNG_SUPPORT)
- # try to find libpng
- find_package(PNG QUIET)
- # Make sure there isn't something wrong with the version of LIBPNG
- # installed on this system. Also never link to anything from anaconda
- # since it's probably broken.
- if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC)
- set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES})
- CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD)
- endif()
- if (PNG_FOUND AND LIBPNG_IS_GOOD)
- include_directories(${PNG_INCLUDE_DIR})
- set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARIES})
- set(REQUIRES_LIBS " libpng")
- else()
- # If we can't find libpng then statically compile it in.
- include_directories(external/libpng external/zlib)
- set(source_files ${source_files}
- external/libpng/arm/arm_init.c
- external/libpng/arm/filter_neon_intrinsics.c
- external/libpng/png.c
- external/libpng/pngerror.c
- external/libpng/pngget.c
- external/libpng/pngmem.c
- external/libpng/pngpread.c
- external/libpng/pngread.c
- external/libpng/pngrio.c
- external/libpng/pngrtran.c
- external/libpng/pngrutil.c
- external/libpng/pngset.c
- external/libpng/pngtrans.c
- external/libpng/pngwio.c
- external/libpng/pngwrite.c
- external/libpng/pngwtran.c
- external/libpng/pngwutil.c
- external/zlib/adler32.c
- external/zlib/compress.c
- external/zlib/crc32.c
- external/zlib/deflate.c
- external/zlib/gzclose.c
- external/zlib/gzlib.c
- external/zlib/gzread.c
- external/zlib/gzwrite.c
- external/zlib/infback.c
- external/zlib/inffast.c
- external/zlib/inflate.c
- external/zlib/inftrees.c
- external/zlib/trees.c
- external/zlib/uncompr.c
- external/zlib/zutil.c
- )
-
- include(cmake_utils/check_if_neon_available.cmake)
- if (ARM_NEON_IS_AVAILABLE)
- message (STATUS "NEON instructions will be used for libpng.")
- enable_language(ASM)
- set(source_files ${source_files}
- external/libpng/arm/arm_init.c
- external/libpng/arm/filter_neon_intrinsics.c
- external/libpng/arm/filter_neon.S
- )
- set_source_files_properties(external/libpng/arm/filter_neon.S PROPERTIES COMPILE_FLAGS "${CMAKE_ASM_FLAGS} ${CMAKE_CXX_FLAGS} -x assembler-with-cpp")
- endif()
- set(REQUIRES_LIBS "")
- endif()
+ find_package(PNG REQUIRED)
+ include_directories(${PNG_INCLUDE_DIR})
+ set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARIES})
set(source_files ${source_files}
image_loader/png_loader.cpp
image_saver/save_png.cpp
@@ -501,68 +440,8 @@
endif()
if (DLIB_JPEG_SUPPORT)
- # try to find libjpeg
- find_package(JPEG QUIET)
- # Make sure there isn't something wrong with the version of libjpeg
- # installed on this system. Also don't use the installed libjpeg
- # if this is an APPLE system because apparently it's broken (as of 2015/01/01).
- if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC)
- set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
- CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
- endif()
- if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
- include_directories(${JPEG_INCLUDE_DIR})
- set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
- else()
- # If we can't find libjpeg then statically compile it in.
- add_definitions(-DDLIB_JPEG_STATIC)
- set(source_files ${source_files}
- external/libjpeg/jcomapi.cpp
- external/libjpeg/jdapimin.cpp
- external/libjpeg/jdapistd.cpp
- external/libjpeg/jdatasrc.cpp
- external/libjpeg/jdcoefct.cpp
- external/libjpeg/jdcolor.cpp
- external/libjpeg/jddctmgr.cpp
- external/libjpeg/jdhuff.cpp
- external/libjpeg/jdinput.cpp
- external/libjpeg/jdmainct.cpp
- external/libjpeg/jdmarker.cpp
- external/libjpeg/jdmaster.cpp
- external/libjpeg/jdmerge.cpp
- external/libjpeg/jdphuff.cpp
- external/libjpeg/jdpostct.cpp
- external/libjpeg/jdsample.cpp
- external/libjpeg/jerror.cpp
- external/libjpeg/jidctflt.cpp
- external/libjpeg/jidctfst.cpp
- external/libjpeg/jidctint.cpp
- external/libjpeg/jidctred.cpp
- external/libjpeg/jmemmgr.cpp
- external/libjpeg/jmemnobs.cpp
- external/libjpeg/jquant1.cpp
- external/libjpeg/jquant2.cpp
- external/libjpeg/jutils.cpp
- external/libjpeg/jcapimin.cpp
- external/libjpeg/jdatadst.cpp
- external/libjpeg/jcparam.cpp
- external/libjpeg/jcapistd.cpp
- external/libjpeg/jcmarker.cpp
- external/libjpeg/jcinit.cpp
- external/libjpeg/jcmaster.cpp
- external/libjpeg/jcdctmgr.cpp
- external/libjpeg/jccoefct.cpp
- external/libjpeg/jccolor.cpp
- external/libjpeg/jchuff.cpp
- external/libjpeg/jcmainct.cpp
- external/libjpeg/jcphuff.cpp
- external/libjpeg/jcprepct.cpp
- external/libjpeg/jcsample.cpp
- external/libjpeg/jfdctint.cpp
- external/libjpeg/jfdctflt.cpp
- external/libjpeg/jfdctfst.cpp
- )
- endif()
+ find_package(JPEG REQUIRED)
+ include_directories(${JPEG_INCLUDE_DIR})
set(source_files ${source_files}
image_loader/jpeg_loader.cpp
image_saver/save_jpeg.cpp
|
