From: Yegor Kozlov <yegor@apache.org>
Date: Tue, 30 Dec 2008 18:51:56 +0000 (+0000)
Subject: added HSSFPictureData.getFormat() as requested in #46320
X-Git-Tag: REL_3_5_BETA5~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a446dc1555bd5fc55c07f2826fd65431917463a;p=poi.git

added HSSFPictureData.getFormat() as requested in #46320

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

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 179b0fdac5..62100ceabf 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,8 @@
 
 		<!-- Don't forget to update status.xml too! -->
         <release version="3.5-beta5" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+           <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
            <action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
            <action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
            <action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 245f8a1a3c..1ba3333f2c 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,8 @@
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.5-beta5" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+           <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
            <action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
            <action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
            <action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 0770350553..81d7c72c62 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
@@ -62,9 +62,23 @@ public class HSSFPictureData implements PictureData
         return blip.getPicturedata();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.poi.hssf.usermodel.PictureData#suggestFileExtension()
+    /**
+     *
+     * @return format of the picture.
+     * @see HSSFWorkbook#PICTURE_TYPE_DIB
+     * @see HSSFWorkbook#PICTURE_TYPE_WMF
+     * @see HSSFWorkbook#PICTURE_TYPE_EMF
+     * @see HSSFWorkbook#PICTURE_TYPE_PNG
+     * @see HSSFWorkbook#PICTURE_TYPE_JPEG
+     * @see HSSFWorkbook#PICTURE_TYPE_PICT
      */
+    public int getFormat(){
+        return blip.getRecordId() - (short)0xF018;
+    }
+
+    /**
+    * @see #getFormat
+    */
     public String suggestFileExtension()
     {
         switch (blip.getRecordId())
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
index bac1ad5782..4e7d18253f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
@@ -55,12 +55,14 @@ public final class TestHSSFPictureData extends TestCase{
                 assertNotNull(jpg);
                 assertEquals(192, jpg.getWidth());
                 assertEquals(176, jpg.getHeight());
+                assertEquals(HSSFWorkbook.PICTURE_TYPE_JPEG, pict.getFormat());
             } else if (ext.equals("png")){
                 //try to read image data using javax.imageio.* (JDK 1.4+)
                 BufferedImage png = ImageIO.read(new ByteArrayInputStream(data));
                 assertNotNull(png);
                 assertEquals(300, png.getWidth());
                 assertEquals(300, png.getHeight());
+                assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());
             } else {
                 //TODO: test code for PICT, WMF and EMF
             }