Bugzilla 42785: Support alignment-adjust for images (submitted by Max Berger)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@554423 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 16 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/image/AbstractFopImage.java b/src/java/org/apache/fop/image/AbstractFopImage.java
index 4d49034a7..97f176712 100644
--- a/src/java/org/apache/fop/image/AbstractFopImage.java
+++ b/src/java/org/apache/fop/image/AbstractFopImage.java
@@ -29,6 +29,7 @@ import java.awt.Color;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.fop.datatypes.Length;
 
 /**
  * Base class to implement the FopImage interface.
@@ -257,6 +258,11 @@ public abstract class AbstractFopImage implements FopImage {
     public int getIntrinsicHeight() {
         return (int)(getHeight() * 72000 / getVerticalResolution());
     }
+    
+    /** @see org.apache.fop.image.FopImage#getIntrinsicAlignmentAdjust() */
+    public Length getIntrinsicAlignmentAdjust() {
+        return this.imageInfo.alignmentAdjust;
+    }
 
     /** @see org.apache.fop.image.FopImage#getHorizontalResolution() */
     public double getHorizontalResolution() {
diff --git a/src/java/org/apache/fop/image/FopImage.java b/src/java/org/apache/fop/image/FopImage.java
index 0db6a95a0..30f3c8258 100644
--- a/src/java/org/apache/fop/image/FopImage.java
+++ b/src/java/org/apache/fop/image/FopImage.java
@@ -24,6 +24,8 @@ import java.awt.color.ColorSpace;
 import java.awt.color.ICC_Profile;
 import java.awt.Color;
 
+import org.apache.fop.datatypes.Length;
+
 /**
  * Fop image interface for loading images.
  *
@@ -90,6 +92,12 @@ public interface FopImage {
     int getIntrinsicHeight();
 
     /**
+     * @return the intrinsic alignment-adjust value or NULL if the image does
+     *         not have one.
+     */
+    Length getIntrinsicAlignmentAdjust();
+    
+    /**
      * @return the horizontal bitmap resolution (in dpi)
      */
     double getHorizontalResolution();
@@ -193,6 +201,8 @@ public interface FopImage {
         public String mimeType;
         /** implementation-specific String (ex. the namespace for XML-based images) */
         public String str;
+        /** intrinsic alignment-adjust or null if there is none */
+        public Length alignmentAdjust;
     }
 
 }