Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix size_t issues across JPEG versions and platforms #4439

Merged
merged 4 commits into from
Sep 17, 2021
Merged

Fix size_t issues across JPEG versions and platforms #4439

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15209e5
Windows use size_t
datumbox Sep 17, 2021
827b7ad
Temporarily pin jpeg <=9b
datumbox Sep 17, 2021
93f8bbb
Temporarily pin jpeg ==9c
datumbox Sep 17, 2021
336bbcd
Remove pinning.
datumbox Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions torchvision/csrc/io/image/cpu/encode_jpeg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) {
#else
// For libjpeg version <= 9b, the out_size parameter in jpeg_mem_dest() is
// defined as unsigned long, whereas in later version, it is defined as size_t.
// For windows backward compatibility, we define JpegSizeType as different types
// according to the libjpeg version used, in order to prevent compilation
// errors.
#if defined(_WIN32) || !defined(JPEG_LIB_VERSION_MAJOR) || \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more Windows checks? Ok with me, but IIUC there used to be discrepancies between Windows / Linux libjpeg that we might need to take into account?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The situation seems to have been resolved in later versions of Windows (9d>=) hence blunt windows filter needs to go. I'll pin different versions of JPEG in a bit to see what exactly is the right condition we should use here.

JPEG_LIB_VERSION_MAJOR < 9 || \
#if !defined(JPEG_LIB_VERSION_MAJOR) || JPEG_LIB_VERSION_MAJOR < 9 || \
(JPEG_LIB_VERSION_MAJOR == 9 && JPEG_LIB_VERSION_MINOR <= 2)
using JpegSizeType = unsigned long;
#else
Expand Down