Start of branch

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Aug 27 15:56:14 CEST 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

framework/include/torchvision/io/image/cpu/common_jpeg.cpp

@@ -0,0 +1,26 @@
+#include "common_jpeg.h"
+
+namespace vision {
+namespace image {
+namespace detail {
+
+#if JPEG_FOUND
+void torch_jpeg_error_exit(j_common_ptr cinfo) {
+  /* cinfo->err really points to a torch_jpeg_error_mgr struct, so coerce
+   * pointer */
+  torch_jpeg_error_ptr myerr = (torch_jpeg_error_ptr)cinfo->err;
+
+  /* Always display the message. */
+  /* We could postpone this until after returning, if we chose. */
+  // (*cinfo->err->output_message)(cinfo);
+  /* Create the message */
+  (*(cinfo->err->format_message))(cinfo, myerr->jpegLastErrorMsg);
+
+  /* Return control to the setjmp point */
+  longjmp(myerr->setjmp_buffer, 1);
+}
+#endif
+
+} // namespace detail
+} // namespace image
+} // namespace vision

framework/include/torchvision/io/image/cpu/common_jpeg.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#if JPEG_FOUND
+#include <stdio.h>
+
+#include <jpeglib.h>
+#include <setjmp.h>
+
+namespace vision {
+namespace image {
+namespace detail {
+
+static const JOCTET EOI_BUFFER[1] = {JPEG_EOI};
+struct torch_jpeg_error_mgr {
+  struct jpeg_error_mgr pub; /* "public" fields */
+  char jpegLastErrorMsg[JMSG_LENGTH_MAX]; /* error messages */
+  jmp_buf setjmp_buffer; /* for return to caller */
+};
+
+using torch_jpeg_error_ptr = struct torch_jpeg_error_mgr*;
+void torch_jpeg_error_exit(j_common_ptr cinfo);
+
+} // namespace detail
+} // namespace image
+} // namespace vision
+
+#endif

framework/include/torchvision/io/image/cpu/common_png.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#if PNG_FOUND
+#include <png.h>
+#include <setjmp.h>
+#endif

framework/include/torchvision/io/image/cpu/decode_image.cpp

@@ -0,0 +1,41 @@
+#include "decode_image.h"
+
+#include "decode_jpeg.h"
+#include "decode_png.h"
+
+namespace vision {
+namespace image {
+
+torch::Tensor decode_image(
+    const torch::Tensor& data,
+    ImageReadMode mode,
+    bool apply_exif_orientation) {
+  // Check that tensor is a CPU tensor
+  TORCH_CHECK(data.device() == torch::kCPU, "Expected a CPU tensor");
+  // Check that the input tensor dtype is uint8
+  TORCH_CHECK(data.dtype() == torch::kU8, "Expected a torch.uint8 tensor");
+  // Check that the input tensor is 1-dimensional
+  TORCH_CHECK(
+      data.dim() == 1 && data.numel() > 0,
+      "Expected a non empty 1-dimensional tensor");
+
+  auto datap = data.data_ptr<uint8_t>();
+
+  const uint8_t jpeg_signature[3] = {255, 216, 255}; // == "\xFF\xD8\xFF"
+  const uint8_t png_signature[4] = {137, 80, 78, 71}; // == "\211PNG"
+
+  if (memcmp(jpeg_signature, datap, 3) == 0) {
+    return decode_jpeg(data, mode, apply_exif_orientation);
+  } else if (memcmp(png_signature, datap, 4) == 0) {
+    return decode_png(
+        data, mode, /*allow_16_bits=*/false, apply_exif_orientation);
+  } else {
+    TORCH_CHECK(
+        false,
+        "Unsupported image file. Only jpeg and png ",
+        "are currently supported.");
+  }
+}
+
+} // namespace image
+} // namespace vision

framework/include/torchvision/io/image/cpu/decode_image.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <torch/types.h>
+#include "../image_read_mode.h"
+
+namespace vision {
+namespace image {
+
+C10_EXPORT torch::Tensor decode_image(
+    const torch::Tensor& data,
+    ImageReadMode mode = IMAGE_READ_MODE_UNCHANGED,
+    bool apply_exif_orientation = false);
+
+} // namespace image
+} // namespace vision