Better handling of lenghts in the ucl part.

2 files changed, 8 insertions, 8 deletions

diff --git a/include/Handle.h b/include/Handle.h
index 894ab8e..8b9f866 100644
--- a/include/Handle.h
+++ b/include/Handle.h
@@ -72,8 +72,8 @@ class Handle : public Base {
     static int zlib_inflate(Handle * in, Handle * out) throw (GeneralException);
     static int zlib_deflate(Handle * in, Handle * out) throw (GeneralException);
 #ifdef HAVE_UCL
-    static int ucl_compress(Handle * in, Handle * out) throw (GeneralException);
-    static int ucl_decompress(Handle * in, Handle * out) throw (GeneralException);
+    static int ucl_compress(Handle * in, Handle * out, int len_in = -1) throw (GeneralException);
+    static int ucl_decompress(Handle * in, Handle * out, int len_in = -1) throw (GeneralException);
 #endif
   protected:
       Handle(int h);
diff --git a/lib/Handle.cc b/lib/Handle.cc
index 5c046d5..1701cd9 100644
--- a/lib/Handle.cc
+++ b/lib/Handle.cc
@@ -875,14 +875,14 @@ int Handle::zlib_deflate(Handle * in, Handle * out) throw (GeneralException) {
 }
 
 #ifdef HAVE_UCL
-int Handle::ucl_compress(Handle * in, Handle * out) throw (GeneralException) {
+int Handle::ucl_compress(Handle * in, Handle * out, int len_in) throw (GeneralException) {
     if (ucl_init() != UCL_E_OK)
         throw GeneralException("ucl_init failed");
     
     unsigned char * b_in, * b_out;
-    unsigned int len_in, len_out;
+    unsigned int len_out;
     
-    len_in = in->GetSize();
+    if (len_in < 0) len_in = in->GetSize() - in->tell();
     len_out = len_in + len_in / 8 + 256;
     
     b_in = (unsigned char *) malloc(len_in);
@@ -901,14 +901,14 @@ int Handle::ucl_compress(Handle * in, Handle * out) throw (GeneralException) {
     return len_out;
 }
 
-int Handle::ucl_decompress(Handle * in, Handle * out) throw (GeneralException) {
+int Handle::ucl_decompress(Handle * in, Handle * out, int len_in) throw (GeneralException) {
     if (ucl_init() != UCL_E_OK)
         throw GeneralException("ucl_init failed");
     
     unsigned char * b_in, * b_out;
-    unsigned int len_in, len_out;
+    unsigned int len_out;
     
-    len_in = in->GetSize();
+    if (len_in < 0) len_in = in->GetSize() - in->tell();
     len_out = len_in + len_in / 8 + 256;
     
     b_in = (unsigned char *) malloc(len_in);