--- a/src/com/jcraft/jzlib/JZlib.java	Fri Aug 01 11:57:17 2014 -0700
+++ b/src/com/jcraft/jzlib/JZlib.java	Fri Aug 01 13:34:58 2014 -0700
@@ -1,6 +1,6 @@
 /* -*-mode:java; c-basic-offset:2; -*- */
 /*
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -8,8 +8,8 @@
   1. Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
 
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
      the documentation and/or other materials provided with the distribution.
 
   3. The names of the authors may not be used to endorse or promote products
@@ -34,34 +34,59 @@
 
 package com.jcraft.jzlib;
 
-final public class JZlib {
-    private static final String version = "1.0.2";
-    public static String version() {return version;}
+final public class JZlib{
+  private static final String version="1.1.0";
+  public static String version(){return version;}
+
+  static final public int MAX_WBITS=15;        // 32K LZ77 window
+  static final public int DEF_WBITS=MAX_WBITS;
+
+  public enum WrapperType {
+    NONE, ZLIB, GZIP, ANY
+  }
 
-    // compression levels
-    static final public int Z_NO_COMPRESSION = 0;
-    static final public int Z_BEST_SPEED = 1;
-    static final public int Z_BEST_COMPRESSION = 9;
-    static final public int Z_DEFAULT_COMPRESSION = (-1);
+  public static final WrapperType W_NONE = WrapperType.NONE;
+  public static final WrapperType W_ZLIB = WrapperType.ZLIB;
+  public static final WrapperType W_GZIP = WrapperType.GZIP;
+  public static final WrapperType W_ANY = WrapperType.ANY;
 
-    // compression strategy
-    static final public int Z_FILTERED = 1;
-    static final public int Z_HUFFMAN_ONLY = 2;
-    static final public int Z_DEFAULT_STRATEGY = 0;
+  // compression levels
+  static final public int Z_NO_COMPRESSION=0;
+  static final public int Z_BEST_SPEED=1;
+  static final public int Z_BEST_COMPRESSION=9;
+  static final public int Z_DEFAULT_COMPRESSION=(-1);
+
+  // compression strategy
+  static final public int Z_FILTERED=1;
+  static final public int Z_HUFFMAN_ONLY=2;
+  static final public int Z_DEFAULT_STRATEGY=0;
 
-    static final public int Z_NO_FLUSH = 0;
-    static final public int Z_PARTIAL_FLUSH = 1;
-    static final public int Z_SYNC_FLUSH = 2;
-    static final public int Z_FULL_FLUSH = 3;
-    static final public int Z_FINISH = 4;
+  static final public int Z_NO_FLUSH=0;
+  static final public int Z_PARTIAL_FLUSH=1;
+  static final public int Z_SYNC_FLUSH=2;
+  static final public int Z_FULL_FLUSH=3;
+  static final public int Z_FINISH=4;
 
-    static final public int Z_OK = 0;
-    static final public int Z_STREAM_END = 1;
-    static final public int Z_NEED_DICT = 2;
-    static final public int Z_ERRNO = -1;
-    static final public int Z_STREAM_ERROR = -2;
-    static final public int Z_DATA_ERROR = -3;
-    static final public int Z_MEM_ERROR = -4;
-    static final public int Z_BUF_ERROR = -5;
-    static final public int Z_VERSION_ERROR = -6;
+  static final public int Z_OK=0;
+  static final public int Z_STREAM_END=1;
+  static final public int Z_NEED_DICT=2;
+  static final public int Z_ERRNO=-1;
+  static final public int Z_STREAM_ERROR=-2;
+  static final public int Z_DATA_ERROR=-3;
+  static final public int Z_MEM_ERROR=-4;
+  static final public int Z_BUF_ERROR=-5;
+  static final public int Z_VERSION_ERROR=-6;
+
+  // The three kinds of block type
+  static final public byte Z_BINARY = 0;
+  static final public byte Z_ASCII = 1;
+  static final public byte Z_UNKNOWN = 2;
+
+  public static long adler32_combine(long adler1, long adler2, long len2){
+    return Adler32.combine(adler1, adler2, len2);
+  }
+
+  public static long crc32_combine(long crc1, long crc2, long len2){
+    return CRC32.combine(crc1, crc2, len2);
+  }
 }