From 455c73757c9cada994d4630633126060dfddfc25 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Wed, 1 Sep 2021 12:11:16 +0100 Subject: [PATCH 1/2] Fixed a couple of typos and removed unnecessary bracket --- torchvision/csrc/io/image/cpu/encode_jpeg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp index 89d05ea4079..452e9060ddc 100644 --- a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp +++ b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp @@ -14,12 +14,12 @@ 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, where as in later version, it is defined as size_t. +// 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 compilcation +// according to the libjpeg version used, in order to prevent compilation // errors. #if defined(_WIN32) || !defined(JPEG_LIB_VERSION_MAJOR) || \ - (JPEG_LIB_VERSION_MAJOR < 9) || \ + JPEG_LIB_VERSION_MAJOR < 9 || \ (JPEG_LIB_VERSION_MAJOR == 9 && JPEG_LIB_VERSION_MINOR <= 2) using JpegSizeType = unsigned long; #else From 39ebec46fbd4707a7c62584cbaa4d3889cf7d7f6 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Wed, 1 Sep 2021 12:22:18 +0100 Subject: [PATCH 2/2] Fixed clang error --- torchvision/csrc/io/image/cpu/encode_jpeg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp index 452e9060ddc..3b669b9906c 100644 --- a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp +++ b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp @@ -19,7 +19,7 @@ torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) { // according to the libjpeg version used, in order to prevent compilation // errors. #if defined(_WIN32) || !defined(JPEG_LIB_VERSION_MAJOR) || \ - JPEG_LIB_VERSION_MAJOR < 9 || \ + JPEG_LIB_VERSION_MAJOR < 9 || \ (JPEG_LIB_VERSION_MAJOR == 9 && JPEG_LIB_VERSION_MINOR <= 2) using JpegSizeType = unsigned long; #else