return PictureType.WPG;
} else if (XSLFRelation.IMAGE_WDP.getContentType().equals(ct)) {
return PictureType.WDP;
+ } else if (XSLFRelation.IMAGE_TIFF.getContentType().equals(ct)) {
+ return PictureType.TIFF;
} else {
return null;
}
case BMP: return XSLFRelation.IMAGE_BMP;
case WPG: return XSLFRelation.IMAGE_WPG;
case WDP: return XSLFRelation.IMAGE_WDP;
+ case TIFF: return XSLFRelation.IMAGE_TIFF;
default: return null;
}
}
\r
import org.apache.poi.POIDataSamples;\r
import org.apache.poi.sl.usermodel.PictureData.PictureType;\r
+import org.apache.poi.util.IOUtils;\r
import org.apache.poi.xslf.XSLFTestDataSamples;\r
import org.junit.Test;\r
import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;\r
assertTrue(ppt2.getPictureData().isEmpty());\r
ppt2.close();\r
}\r
+ \r
+ @Test\r
+ public void testTiffImageBug59742() throws Exception {\r
+ XMLSlideShow slideShow = new XMLSlideShow();\r
+ final InputStream tiffStream = _slTests.openResourceAsStream("testtiff.tif");\r
+ final byte[] pictureData = IOUtils.toByteArray(tiffStream);\r
+ IOUtils.closeQuietly(tiffStream);\r
+ \r
+ XSLFPictureData pic = slideShow.addPicture(pictureData, PictureType.TIFF);\r
+ assertEquals("image/tiff", pic.getContentType());\r
+ assertEquals("image1.tiff", pic.getFileName());\r
+ \r
+ slideShow.close();\r
+ }\r
}
\ No newline at end of file