Changeset 13061 in josm for trunk/src/com/drew/metadata/iptc/Iso2022Converter.java

Timestamp:

2017-10-30T22:46:09+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #15505 - update to metadata-extractor 2.10.1

File:

• trunk/src/com/drew/metadata/iptc/Iso2022Converter.java (modified) (5 diffs)

trunk/src/com/drew/metadata/iptc/Iso2022Converter.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2016 Drew Noakes
+ * Copyright 2002-2017 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -59 +59 @@
 
     /**
-     * Attempts to guess the encoding of a string provided as a byte array.
+     * Attempts to guess the {@link Charset} of a string provided as a byte array.
      * <p>
-     * Encodings trialled are, in order:
+     * Charsets trialled are, in order:
      * <ul>
      *     <li>UTF-8</li>
@@ -68 +68 @@
      * </ul>
      * <p>
-     * Its only purpose is to guess the encoding if and only if iptc tag coded character set is not set. If the
+     * Its only purpose is to guess the Charset if and only if IPTC tag coded character set is not set. If the
      * encoding is not UTF-8, the tag should be set. Otherwise it is bad practice. This method tries to
      * workaround this issue since some metadata manipulating tools do not prevent such bad practice.
@@ -79 +79 @@
      */
     @Nullable
-    static String guessEncoding(@NotNull final byte[] bytes)
+    static Charset guessCharSet(@NotNull final byte[] bytes)
     {
         String[] encodings = { UTF_8, System.getProperty("file.encoding"), ISO_8859_1 };
@@ -85 +85 @@
         for (String encoding : encodings)
         {
-            CharsetDecoder cs = Charset.forName(encoding).newDecoder();
+            Charset charset = Charset.forName(encoding);
+            CharsetDecoder cs = charset.newDecoder();
 
             try {
                 cs.decode(ByteBuffer.wrap(bytes));
-                return encoding;
+                return charset;
             } catch (CharacterCodingException e) {
                 // fall through...