diff options
author | PJ Fanning <fanningpj@apache.org> | 2021-10-23 10:49:18 +0000 |
---|---|---|
committer | PJ Fanning <fanningpj@apache.org> | 2021-10-23 10:49:18 +0000 |
commit | 6a12c6cb256c7054c656c657bd056be4a32b030b (patch) | |
tree | 349167447eea032cba2fcac8db994cb6c9991400 /poi/src | |
parent | 22bac58465b5187609a58a9eec0b5e7f537a1485 (diff) | |
download | poi-6a12c6cb256c7054c656c657bd056be4a32b030b.tar.gz poi-6a12c6cb256c7054c656c657bd056be4a32b030b.zip |
[bug-65650] use image/x-pict mime type
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894507 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi/src')
-rw-r--r-- | poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java | 2 | ||||
-rw-r--r-- | poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java b/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java index d3ed67fc2e..2a5c6625fb 100644 --- a/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java +++ b/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java @@ -30,7 +30,7 @@ public enum PictureType { /** Windows Meta File */ WMF("image/x-wmf",".wmf"), /** Mac PICT format */ - PICT("image/pict",".pict"), // or image/x-pict (for HSLF) ??? + PICT("image/x-pict",".pict"), /** JPEG format */ JPEG("image/jpeg",".jpg"), /** PNG format */ diff --git a/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java index 5ade4d33f1..c6afb2ec4b 100644 --- a/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java +++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java @@ -28,7 +28,7 @@ public interface PictureData { /** Windows Meta File */ WMF(3,3,"image/x-wmf",".wmf"), /** Mac PICT format */ - PICT(4,4,"image/pict",".pict"), // or image/x-pict (for HSLF) ??? + PICT(4,4,"image/x-pict",".pict"), /** JPEG format */ JPEG(5,5,"image/jpeg",".jpg"), /** PNG format */ @@ -60,7 +60,7 @@ public interface PictureData { ; public final int nativeId, ooxmlId; - public final String contentType,extension; + public final String contentType, extension; PictureType(int nativeId, int ooxmlId,String contentType,String extension) { this.nativeId = nativeId; |