[patch] Fix to populate the content before checking if the image is WMF or EMF

hwpf-picture-npe-fix.patch (text/plain), 979 bytes, created by Trejkaz (pen name) on 2007-02-18 16:19:54 UTC

(hide)

Description: Fix to populate the content before checking if the image is WMF or EMF

Filename:

MIME Type:

Creator: Trejkaz (pen name)

Created: 2007-02-18 16:19:54 UTC

Size: 979 bytes

patch

obsolete

>Index: src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java >=================================================================== >--- src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java (revision 509036) >+++ src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java (working copy) >@@ -223,11 +223,13 @@ > } else if (matchSignature(_dataStream, TIFF, pictureBytesStartOffset) || > matchSignature(_dataStream, TIFF1, pictureBytesStartOffset)) { > return "tiff"; >- } else if (matchSignature(content, WMF1, 0) || >- matchSignature(content, WMF2, 0)) { >- return "wmf"; >- } else if (matchSignature(content, EMF, 0)) { >- return "emf"; >+ } else { >+ fillImageContent(); >+ if (matchSignature(content, WMF1, 0) || matchSignature(content, WMF2, 0)) { >+ return "wmf"; >+ } else if (matchSignature(content, EMF, 0)) { >+ return "emf"; >+ } > } > // TODO: DIB, PICT > return ""; View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]