Browse Source

XSLFPictureData support for TIFF images - patch and tests from bug #59742 from Jens Popp

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749732 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_3_15_BETA2
Nick Burch 8 years ago
parent
commit
ec07d025c1

+ 3
- 0
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java View File

return PictureType.WPG; return PictureType.WPG;
} else if (XSLFRelation.IMAGE_WDP.getContentType().equals(ct)) { } else if (XSLFRelation.IMAGE_WDP.getContentType().equals(ct)) {
return PictureType.WDP; return PictureType.WDP;
} else if (XSLFRelation.IMAGE_TIFF.getContentType().equals(ct)) {
return PictureType.TIFF;
} else { } else {
return null; return null;
} }
case BMP: return XSLFRelation.IMAGE_BMP; case BMP: return XSLFRelation.IMAGE_BMP;
case WPG: return XSLFRelation.IMAGE_WPG; case WPG: return XSLFRelation.IMAGE_WPG;
case WDP: return XSLFRelation.IMAGE_WDP; case WDP: return XSLFRelation.IMAGE_WDP;
case TIFF: return XSLFRelation.IMAGE_TIFF;
default: return null; default: return null;
} }
} }

+ 15
- 0
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java View File

import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.sl.usermodel.PictureData.PictureType; import org.apache.poi.sl.usermodel.PictureData.PictureType;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xslf.XSLFTestDataSamples; import org.apache.poi.xslf.XSLFTestDataSamples;
import org.junit.Test; import org.junit.Test;
import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture; import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
assertTrue(ppt2.getPictureData().isEmpty()); assertTrue(ppt2.getPictureData().isEmpty());
ppt2.close(); ppt2.close();
} }
@Test
public void testTiffImageBug59742() throws Exception {
XMLSlideShow slideShow = new XMLSlideShow();
final InputStream tiffStream = _slTests.openResourceAsStream("testtiff.tif");
final byte[] pictureData = IOUtils.toByteArray(tiffStream);
IOUtils.closeQuietly(tiffStream);
XSLFPictureData pic = slideShow.addPicture(pictureData, PictureType.TIFF);
assertEquals("image/tiff", pic.getContentType());
assertEquals("image1.tiff", pic.getFileName());
slideShow.close();
}
} }

BIN
test-data/slideshow/testtiff.tif View File


Loading…
Cancel
Save