Changeset 1556 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

06/22/11 02:18:03 (11 months ago)

Author:

jharrop

Message:

Native support for bitmap (bmp) images

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging

Files:

• contenttype/ContentTypeManager.java (modified) (1 diff)
• contenttype/ContentTypes.java (modified) (1 diff)
• parts/WordprocessingML/BinaryPartAbstractImage.java (modified) (1 diff)
• parts/WordprocessingML/ImageBmpPart.java (added)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java

@@ -385 +385 @@
 //                      
 //                      return new org.docx4j.openpackaging.parts.WordprocessingML.ImageEpsPart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.IMAGE_BMP)) {
+                        
+                        if (!partName.toLowerCase().endsWith("." + ContentTypes.EXTENSION_BMP) ) {
+                                partName = partName + "." + ContentTypes.EXTENSION_BMP;
+                        }                       
+                        
+                        return new org.docx4j.openpackaging.parts.WordprocessingML.ImageGifPart(new PartName(partName));
                 } else if (contentType.equals(ContentTypes.IMAGE_EMF) || contentType.equals(ContentTypes.IMAGE_EMF2)) {
                         return new MetafileEmfPart(new PartName(partName));

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java

@@ -354 +354 @@
         public static final String IMAGE_EPS = "application/postscript";  // as reported by XmlGraphics 
         public static final String EXTENSION_EPS = "eps";  
+
+        public static final String IMAGE_BMP = "image/bmp";
+        public static final String EXTENSION_BMP = "bmp";
         
 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java

@@ -317 +317 @@
                                         || info.getMimeType().equals(ContentTypes.IMAGE_GIF) 
 //                                       || info.getMimeType().equals(ContentTypes.IMAGE_EPS)
+                                        || info.getMimeType().equals(ContentTypes.IMAGE_BMP) 
                                         )) {
                                         // TODO: add other supported formats