For std::min and std::max cast to like data types (#2389)

Signed-off-by: Jeff Kriske <kriske_jeffery_e@lilly.com>
pytorch · Jul 6, 2020 · 67f5fcf · 67f5fcf
1 parent 75f5b57
commit 67f5fcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/torchvision/csrc/cpu/decoder/seekable_buffer.cpp b/torchvision/csrc/cpu/decoder/seekable_buffer.cpp
@@ -55,7 +55,7 @@ bool SeekableBuffer::readBytes(
     size_t maxBytes,
     uint64_t timeoutMs) {
   // Resize to th minimum 4K page or less
-  buffer_.resize(std::min(maxBytes, 4 * 1024UL));
+  buffer_.resize(std::min(maxBytes, size_t(4 * 1024UL)));
   end_ = 0;
   eof_ = false;
 
@@ -72,7 +72,7 @@ bool SeekableBuffer::readBytes(
     if (res > 0) {
       end_ += res;
       if (end_ == buffer_.size()) {
-        buffer_.resize(std::min(end_ * 4UL, maxBytes));
+        buffer_.resize(std::min(size_t(end_ * 4UL), maxBytes));
       }
     } else if (res == 0) {
       eof_ = true;

diff --git a/torchvision/csrc/cpu/decoder/util.cpp b/torchvision/csrc/cpu/decoder/util.cpp
@@ -395,8 +395,8 @@ void setFormatDimensions(
     }
   }
   // prevent zeros
-  destW = std::max(destW, 1UL);
-  destH = std::max(destH, 1UL);
+  destW = std::max(destW, size_t(1UL));
+  destH = std::max(destH, size_t(1UL));
 }
 } // namespace Util
 } // namespace ffmpeg