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
vision
Commits
786ec325
Unverified
Commit
786ec325
authored
Oct 01, 2020
by
Edgar Andrés Margffoy Tuay
Committed by
GitHub
Oct 01, 2020
Browse files
Set macro value when libpng version is invalid (#2735)
parent
b618923c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
setup.py
setup.py
+1
-1
No files found.
setup.py
View file @
786ec325
...
...
@@ -264,7 +264,6 @@ def get_extensions():
libpng
=
distutils
.
spawn
.
find_executable
(
'libpng-config'
)
pngfix
=
distutils
.
spawn
.
find_executable
(
'pngfix'
)
png_found
=
libpng
is
not
None
or
pngfix
is
not
None
image_macros
+=
[(
'PNG_FOUND'
,
str
(
int
(
png_found
)))]
print
(
'PNG found: {0}'
.
format
(
png_found
))
if
png_found
:
if
libpng
is
not
None
:
...
...
@@ -307,6 +306,7 @@ def get_extensions():
jpeg_include
,
jpeg_lib
)
=
find_library
(
'jpeglib'
,
vision_include
)
print
(
'JPEG found: {0}'
.
format
(
jpeg_found
))
image_macros
+=
[(
'PNG_FOUND'
,
str
(
int
(
png_found
)))]
image_macros
+=
[(
'JPEG_FOUND'
,
str
(
int
(
jpeg_found
)))]
if
jpeg_found
:
print
(
'Building torchvision with JPEG image support'
)
...
...
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