Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
36703f69
Commit
36703f69
authored
Oct 31, 2019
by
Davis King
Browse files
Improve check that the system version of libjpeg is usable.
parent
e30f5e2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
dlib/cmake_utils/find_libjpeg.cmake
dlib/cmake_utils/find_libjpeg.cmake
+1
-1
dlib/cmake_utils/test_for_libjpeg/libjpeg_test.cpp
dlib/cmake_utils/test_for_libjpeg/libjpeg_test.cpp
+4
-0
No files found.
dlib/cmake_utils/find_libjpeg.cmake
View file @
36703f69
...
...
@@ -31,7 +31,7 @@ if(JPEG_FOUND)
message
(
STATUS
"Found system copy of libjpeg:
${
JPEG_LIBRARY
}
"
)
if
(
NOT test_for_libjpeg_worked
)
set
(
JPEG_FOUND 0
)
message
(
STATUS
"System copy of libjpeg is broken. Will build our own libjpeg and use that instead."
)
message
(
STATUS
"System copy of libjpeg is broken
or too old
. Will build our own libjpeg and use that instead."
)
endif
()
endif
()
...
...
dlib/cmake_utils/test_for_libjpeg/libjpeg_test.cpp
View file @
36703f69
...
...
@@ -41,6 +41,10 @@ int main()
jpeg_create_decompress
(
&
cinfo
);
jpeg_stdio_src
(
&
cinfo
,
fp
);
if
(
false
)
{
unsigned
char
imgbuffer
[
1234
];
jpeg_mem_src
(
&
cinfo
,
imgbuffer
,
sizeof
(
imgbuffer
));
}
jpeg_read_header
(
&
cinfo
,
TRUE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment