Merge branch 'main' into patch-1

Anner-deJong · web-flow · commit 48bc3d3527a6 · 2024-03-22T10:39:29.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -196,10 +196,6 @@ inline int fetch_jpeg_exif_orientation(j_decompress_ptr cinfo) {`
`196`	`196`
`197`	`197`	`return fetch_exif_orientation(exif_data_ptr, size);`
`198`	`198`	`}`
`199`		`-#else // #if JPEG_FOUND`
`200`		`-inline int fetch_jpeg_exif_orientation(j_decompress_ptr cinfo) {`
`201`		`- return -1;`
`202`		`-}`
`203`	`199`	`#endif // #if JPEG_FOUND`
`204`	`200`
`205`	`201`	`#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) {`
`216`	`212`	`return fetch_exif_orientation(exif, num_exif);`
`217`	`213`	`}`
`218`	`214`	`}`
`219`		`-#else // #if PNG_FOUND && defined(PNG_eXIf_SUPPORTED)`
`220`		`-inline int fetch_png_exif_orientation(png_structp png_ptr, png_infop info_ptr) {`
`221`		`- return -1;`
`222`		`-}`
`223`	`215`	`#endif // #if PNG_FOUND && defined(PNG_eXIf_SUPPORTED)`
`224`	`216`
`225`	`217`	`constexpr uint16_t IMAGE_ORIENTATION_TL = 1; // normal orientation`