[dcm4che-commits] CVS: dcm4jboss-sar/src/java/org/dcm4chex/archive/codec CompressCmd.java,1.4,1.5

[Franz W. <jav...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/codec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13047/src/java/org/dcm4chex/archive/codec

Modified Files:
	CompressCmd.java 
Log Message:
throws EOF exception if pixel matrix is too short.

Index: CompressCmd.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/codec/CompressCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompressCmd.java	16 Mar 2005 13:43:10 -0000	1.4
--- CompressCmd.java	16 Mar 2005 15:31:20 -0000	1.5
***************
*** 323,330 ****
  
      private void read(InputStream in, byte[][] data) throws IOException {
          for (int i = 0; i < data.length; i++) {
              byte[] bank = data[i];
!             for (int toread = bank.length; toread > 0;)
!                 toread -= in.read(bank, bank.length - toread, toread);
          }
      }
--- 323,334 ----
  
      private void read(InputStream in, byte[][] data) throws IOException {
+     	int read;
          for (int i = 0; i < data.length; i++) {
              byte[] bank = data[i];
!             for (int toread = bank.length; toread > 0;) {
!                 read = in.read(bank, bank.length - toread, toread);
!                 if ( read == -1 ) throw new EOFException("Length of pixel matrix is too short!");
!                 toread -= read;
!             }
          }
      }