findbugs fixes

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java b/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
index 0de8cd744a6cb507af4658e6ae9912474eaf8f56..4d7de5f75d213fba65a80471678f3dbc9e03c590 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
@@ -76,7 +76,8 @@ public final class EMF extends Metafile {
             InputStream is = new ByteArrayInputStream( rawdata );
             Header header = new Header();
             header.read(rawdata, CHECKSUM_SIZE);
-            is.skip(header.getSize() + CHECKSUM_SIZE);
+            long len = is.skip(header.getSize() + CHECKSUM_SIZE);
+            assert(len == header.getSize() + CHECKSUM_SIZE);
 
             InflaterInputStream inflater = new InflaterInputStream( is );
             byte[] chunk = new byte[4096];

diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java b/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
index bd459c1d45e96521c3e16127eb9527b2cc3e4c42..9dbc7f3bc320f357800201640f9a44e051c05a4d 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
@@ -46,7 +46,8 @@ public final class WMF extends Metafile {
             InputStream is = new ByteArrayInputStream( rawdata );
             Header header = new Header();
             header.read(rawdata, CHECKSUM_SIZE*uidInstanceCount);
-            is.skip(header.getSize() + CHECKSUM_SIZE*uidInstanceCount);
+            long len = is.skip(header.getSize() + CHECKSUM_SIZE*uidInstanceCount);
+            assert(len == header.getSize() + CHECKSUM_SIZE*uidInstanceCount);
 
             NativeHeader aldus = new NativeHeader(header.bounds);
             aldus.write(out);

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
index a36cfd4d90514fc273e3066f29e10ae9291d1da0..247f22bd864b95e16ccbe2aab92dd4928194b083 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
@@ -70,7 +70,8 @@ public class HwmfHeader {
         bytesLeft -= LittleEndianConsts.SHORT_SIZE;\r
         \r
         if (bytesLeft > 0) {\r
-            leis.skip(bytesLeft);\r
+            long len = leis.skip(bytesLeft);\r
+            assert(len == bytesLeft);\r
         }\r
     }\r
 }\r