🔃 implement some auto rotate functions

criteo · Jul 22, 2020 · 885974d · 885974d
1 parent 29111b7
commit 885974d
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 13 deletions.
diff --git a/src/main/c/VipsImage.c b/src/main/c/VipsImage.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2019 Criteo
+  Copyright (c) 2020 Criteo
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -553,3 +553,33 @@ JNICALL Java_com_criteo_vips_VipsImage_linearNative(JNIEnv *env, jobject image_o
         }
     }
 }
+
+JNIEXPORT jint
+JNICALL Java_com_criteo_vips_VipsImage_getAutorotAngleNative(JNIEnv *env, jobject image_obj)
+{
+    VipsImage *im = (VipsImage *) (*env)->GetLongField(env, image_obj, handle_fid);
+
+    return (int) vips_autorot_get_angle(im);
+}
+
+JNIEXPORT void
+JNICALL Java_com_criteo_vips_VipsImage_autorot(JNIEnv *env, jobject image_obj)
+{
+    VipsImage *im = (VipsImage *) (*env)->GetLongField(env, image_obj, handle_fid);
+    VipsImage *out = NULL;
+
+    if (vips_autorot(im, &out, NULL))
+    {
+        throwVipsException(env, "Unable to auto rotate image");
+        return;
+    }
+    (*env)->SetLongField(env, image_obj, handle_fid, (jlong) out);
+    g_object_unref(im);
+}
+
+JNIEXPORT void
+JNICALL Java_com_criteo_vips_VipsImage_removeAutorotAngle(JNIEnv *env, jobject image_obj)
+{
+    VipsImage *im = (VipsImage *) (*env)->GetLongField(env, image_obj, handle_fid);
+    vips_autorot_remove_angle(im);
+}
diff --git a/src/main/c/VipsImage.h b/src/main/c/VipsImage.h
diff --git a/src/main/java/com/criteo/vips/Image.java b/src/main/java/com/criteo/vips/Image.java
@@ -16,10 +16,7 @@
 
 package com.criteo.vips;
 
-import com.criteo.vips.enums.VipsBandFormat;
-import com.criteo.vips.enums.VipsCompassDirection;
-import com.criteo.vips.enums.VipsImageFormat;
-import com.criteo.vips.enums.VipsInterpretation;
+import com.criteo.vips.enums.*;
 
 import java.awt.*;
 import java.io.Closeable;
@@ -264,6 +261,23 @@ public interface Image extends Closeable {
      */
     int getNbFrame();
 
+    /**
+     * @return Auto rotation angle metadata
+     */
+    VipsAngle getAutorotAngle();
+
+    /**
+     * Apply an auto rotation according to the image EXIF metadata
+     *
+     * @throws VipsException
+     */
+    void autorot() throws VipsException;
+
+    /**
+     * Remove the orientation tag on the image
+     */
+    void removeAutorotAngle();
+
     /**
      * Release VipsImage reference
      */

diff --git a/src/main/java/com/criteo/vips/VipsImage.java b/src/main/java/com/criteo/vips/VipsImage.java
@@ -16,10 +16,7 @@
 
 package com.criteo.vips;
 
-import com.criteo.vips.enums.VipsBandFormat;
-import com.criteo.vips.enums.VipsCompassDirection;
-import com.criteo.vips.enums.VipsImageFormat;
-import com.criteo.vips.enums.VipsInterpretation;
+import com.criteo.vips.enums.*;
 
 import java.awt.*;
 import java.nio.ByteBuffer;
@@ -238,5 +235,15 @@ public VipsInterpretation getInterpretation() {
 
     public native int getNbFrame();
 
+    public VipsAngle getAutorotAngle() {
+        return VipsAngle.valueOf(getAutorotAngleNative());
+    }
+
+    private native int getAutorotAngleNative();
+
+    public native void autorot() throws VipsException;
+
+    public native void removeAutorotAngle();
+
     public native void release();
 }
diff --git a/src/test/java/com/criteo/vips/VipsImageTest.java b/src/test/java/com/criteo/vips/VipsImageTest.java
@@ -16,10 +16,7 @@
 
 package com.criteo.vips;
 
-import com.criteo.vips.enums.VipsBandFormat;
-import com.criteo.vips.enums.VipsCompassDirection;
-import com.criteo.vips.enums.VipsImageFormat;
-import com.criteo.vips.enums.VipsInterpretation;
+import com.criteo.vips.enums.*;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -783,4 +780,25 @@ public void TestBlack() throws IOException, VipsException {
             }
         }
     }
+
+    @Test
+    public void TestRemoveAutorotAngle() throws IOException, VipsException {
+        ByteBuffer buffer = VipsTestUtils.getDirectByteBuffer("exif_rotate_90_cw.jpg");
+
+        try (VipsImage img = new VipsImage(buffer, buffer.capacity())) {
+            assertEquals(VipsAngle.D90, img.getAutorotAngle());
+            img.removeAutorotAngle();
+            assertEquals(VipsAngle.D0, img.getAutorotAngle());
+        }
+    }
+
+    @Test
+    public void TestExif90CWAutorot() throws IOException, VipsException {
+        ByteBuffer buffer = VipsTestUtils.getDirectByteBuffer("exif_rotate_90_cw.jpg");
+
+        try (VipsImage img = new VipsImage(buffer, buffer.capacity())) {
+            img.autorot();
+            assertEquals(WhitePixel, img.getPointPixelPacket(0, 0));
+        }
+    }
 }
diff --git a/src/test/resources/exif_rotate_90_cw.jpg b/src/test/resources/exif_rotate_90_cw.jpg