Merge branch 'main' into patch-1

pytorch · Mar 22, 2024 · 48bc3d3 · 48bc3d3
2 parents cfa9a32 + 480eec2
commit 48bc3d3
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/torchvision/csrc/io/image/cpu/exif.h b/torchvision/csrc/io/image/cpu/exif.h
@@ -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)
@@ -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