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 compilation error when there is no libjpeg #8342

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Fix compilation error when there is no libjpeg #8342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
277c839
Fix compilation error when there is no libjpeg
cdzhan Mar 20, 2024
f691d53
Merge branch 'main' into cdzhan-patch-1
vfdev-5 Mar 21, 2024
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
8 changes: 0 additions & 8 deletions torchvision/csrc/io/image/cpu/exif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,6 @@ inline int fetch_jpeg_exif_orientation(j_decompress_ptr cinfo) {

return fetch_exif_orientation(exif_data_ptr, size);
}
#else // #if JPEG_FOUND
inline int fetch_jpeg_exif_orientation(j_decompress_ptr cinfo) {
return -1;
}
#endif // #if JPEG_FOUND

#if PNG_FOUND && defined(PNG_eXIf_SUPPORTED)
Expand All @@ -216,10 +212,6 @@ inline int fetch_png_exif_orientation(png_structp png_ptr, png_infop info_ptr) {
return fetch_exif_orientation(exif, num_exif);
}
}
#else // #if PNG_FOUND && defined(PNG_eXIf_SUPPORTED)
inline int fetch_png_exif_orientation(png_structp png_ptr, png_infop info_ptr) {
return -1;
}
#endif // #if PNG_FOUND && defined(PNG_eXIf_SUPPORTED)

constexpr uint16_t IMAGE_ORIENTATION_TL = 1; // normal orientation
Expand Down
Loading