Corrected simple mistake in BMP Reader which incorrectly reported the image width...

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

diff --git a/src/java/org/apache/fop/image/analyser/BMPReader.java b/src/java/org/apache/fop/image/analyser/BMPReader.java
index 12be15dab974a76ca31d045dc4f01ab94284d62e..74f6a161c08869fefee9c1df2b2b208c8688af7b 100644 (file)
--- a/src/java/org/apache/fop/image/analyser/BMPReader.java
+++ b/src/java/org/apache/fop/image/analyser/BMPReader.java
@@ -40,7 +40,7 @@ public class BMPReader implements ImageReader {
     /** offset to width */
     private static final int WIDTH_OFFSET = 18;
     /** offset to height */
-    private static final int HEIGHT_OFFSET = 18;
+    private static final int HEIGHT_OFFSET = 22;
     /** offset to horizontal res */
     private static final int HRES_OFFSET = 38;
     /** offset to vertical res */

diff --git a/status.xml b/status.xml
index 1e5252b34c447de6ed98b1a603daf4a4dc3bbb9d..6c6db6700e93272e92534d0fd974b5c262cdd37d 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="MM" type="fix" fixes-bug="38089">
+        Bugfix: Image height for BMP images was incorrectly calculated
+      </action>
       <action context="Code" dev="AD" type="update">
         Revision of refinement white-space handling.
       </action>