Issue #1926 - Update image/Orientation.h

1 files changed, 64 insertions, 3 deletions

diff --git a/image/Orientation.h b/image/Orientation.h
index a0f2e1b75a..e6eb6f6428 100644
--- a/image/Orientation.h
+++ b/image/Orientation.h
@@ -7,8 +7,31 @@
 #define mozilla_image_Orientation_h
 
 #include <stdint.h>
+#include "mozilla/gfx/Rect.h"
 
 namespace mozilla {
+
+// Pixel values in an image considering orientation metadata, such as the size
+// of an image as seen by consumers of the image.
+//
+// Any public methods on RasterImage that use untyped units are interpreted as
+// oriented pixels.
+struct OrientedPixel {};
+template <>
+struct IsPixel<OrientedPixel> : std::true_type {};
+typedef gfx::IntPointTyped<OrientedPixel> OrientedIntPoint;
+typedef gfx::IntSizeTyped<OrientedPixel> OrientedIntSize;
+typedef gfx::IntRectTyped<OrientedPixel> OrientedIntRect;
+
+// Pixel values in an image ignoring orientation metadata, such as are stored
+// in surfaces and the raw pixel data in the image.
+struct UnorientedPixel {};
+template <>
+struct IsPixel<UnorientedPixel> : std::true_type {};
+typedef gfx::IntPointTyped<UnorientedPixel> UnorientedIntPoint;
+typedef gfx::IntSizeTyped<UnorientedPixel> UnorientedIntSize;
+typedef gfx::IntRectTyped<UnorientedPixel> UnorientedIntRect;
+
 namespace image {
 
 enum class Angle : uint8_t {
@@ -27,15 +50,24 @@ enum class Flip : uint8_t {
  * A struct that describes an image's orientation as a rotation optionally
  * followed by a reflection. This may be used to be indicate an image's inherent
  * orientation or a desired orientation for the image.
+ *
+ * When flipFirst = true, this indicates that the reflection is applied before
+ * the rotation. (This is used by OrientedImage to represent the inverse of an
+ * underlying image's Orientation.)
  */
 struct Orientation
 {
   explicit Orientation(Angle aRotation = Angle::D0,
-                       Flip mFlip = Flip::Unflipped)
+                       Flip aFlip = Flip::Unflipped, bool aFlipFirst = false)
     : rotation(aRotation)
-    , flip(mFlip)
+    , flip(aFlip)
+    , flipFirst(aFlipFirst)
   { }
 
+  Orientation Reversed() const {
+    return Orientation(InvertAngle(rotation), flip, !flipFirst);
+  }
+
   bool IsIdentity() const {
     return (rotation == Angle::D0) && (flip == Flip::Unflipped);
   }
@@ -45,15 +77,44 @@ struct Orientation
   }
 
   bool operator==(const Orientation& aOther) const {
-    return (rotation == aOther.rotation) && (flip == aOther.flip);
+    return (rotation == aOther.rotation) && (flip == aOther.flip) &&
+           (flipFirst == aOther.flipFirst);
   }
 
   bool operator!=(const Orientation& aOther) const {
     return !(*this == aOther);
   }
 
+  OrientedIntSize ToOriented(const UnorientedIntSize& aSize) const {
+    if (SwapsWidthAndHeight()) {
+      return OrientedIntSize(aSize.height, aSize.width);
+    } else {
+      return OrientedIntSize(aSize.width, aSize.height);
+    }
+  }
+
+  UnorientedIntSize ToUnoriented(const OrientedIntSize& aSize) const {
+    if (SwapsWidthAndHeight()) {
+      return UnorientedIntSize(aSize.height, aSize.width);
+    } else {
+      return UnorientedIntSize(aSize.width, aSize.height);
+    }
+  }
+
+  static Angle InvertAngle(Angle aAngle) {
+    switch (aAngle) {
+      case Angle::D90:
+        return Angle::D270;
+      case Angle::D270:
+        return Angle::D90;
+      default:
+        return aAngle;
+    }
+  }
+
   Angle rotation;
   Flip  flip;
+  bool  flipFirst;
 };
 
 } // namespace image