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
2326a722
Commit
2326a722
authored
Jan 18, 2020
by
Davis King
Browse files
fix code not compiling with some versions of libjpeg as a result of the change I just made.
parent
e1b66718
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
dlib/image_loader/jpeg_loader.cpp
dlib/image_loader/jpeg_loader.cpp
+1
-1
No files found.
dlib/image_loader/jpeg_loader.cpp
View file @
2326a722
...
@@ -138,7 +138,7 @@ namespace dlib
...
@@ -138,7 +138,7 @@ namespace dlib
jpeg_create_decompress
(
&
cinfo
);
jpeg_create_decompress
(
&
cinfo
);
if
(
file
!=
NULL
)
jpeg_stdio_src
(
&
cinfo
,
file
);
if
(
file
!=
NULL
)
jpeg_stdio_src
(
&
cinfo
,
file
);
else
if
(
imgbuffer
!=
NULL
)
jpeg_mem_src
(
&
cinfo
,
imgbuffer
,
imgbuffersize
);
else
if
(
imgbuffer
!=
NULL
)
jpeg_mem_src
(
&
cinfo
,
(
unsigned
char
*
)
imgbuffer
,
imgbuffersize
);
else
throw
image_load_error
(
std
::
string
(
"jpeg_loader: no valid image source"
));
else
throw
image_load_error
(
std
::
string
(
"jpeg_loader: no valid image source"
));
jpeg_read_header
(
&
cinfo
,
TRUE
);
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