X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FBase64.java;h=476160182475a7d51850a64dafef25ea576782a1;hb=b6200792e591f13c2d8ecedc4d2015db8ff76cbe;hp=efb57b4a0cf1d62fa8025d96f26361bc2a61ec2f;hpb=3f27754118de06bdfedce5574957a9bc9557a8dc;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Base64.java b/src/be/nikiroo/utils/Base64.java
index efb57b4..4761601 100644
--- a/src/be/nikiroo/utils/Base64.java
+++ b/src/be/nikiroo/utils/Base64.java
@@ -208,7 +208,7 @@ class Base64
     
     
     /** Preferred encoding. */
-    private final static String PREFERRED_ENCODING = "US-ASCII";
+    private final static String PREFERRED_ENCODING = "UTF-8";
     
 	
     private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
@@ -1249,8 +1249,24 @@ class Base64
         }   // end catch
 		//</change>
         
+        return niki_decode(bytes, 0, bytes.length, options);
+    }
+     
+    /**
+     * Decodes data from Base64 notation, automatically
+     * detecting gzip-compressed data and decompressing it.
+     *
+     * @param s the string to decode
+     * @param options encode options such as URL_SAFE
+     * @return the decoded data
+     * @throws java.io.IOException if there is an error
+     * @throws NullPointerException if <tt>s</tt> is null
+     * @since niki
+     */
+    public static byte[] niki_decode( byte[] bytes, int offset, int count, int options ) throws java.io.IOException {
+        
         // Decode
-        bytes = decode( bytes, 0, bytes.length, options );
+        bytes = decode( bytes, offset, count, options );
         
         // Check to see if it's gzip-compressed
         // GZIP Magic Two-Byte Number: 0x8b1f (35615)