Maybe avoid weird Proguard issue by removing inner class?

git-svn-id: http://zxing.googlecode.com/svn/trunk@1177 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/qrcode/encoder/BlockPair.java b/core/src/com/google/zxing/qrcode/encoder/BlockPair.java
new file mode 100644 (file)
index 0000000..fece499
--- /dev/null
+++ b/core/src/com/google/zxing/qrcode/encoder/BlockPair.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.qrcode.encoder;
+
+import com.google.zxing.common.ByteArray;
+
+final class BlockPair {
+
+  private final ByteArray dataBytes;
+  private final ByteArray errorCorrectionBytes;
+
+  BlockPair(ByteArray data, ByteArray errorCorrection) {
+    dataBytes = data;
+    errorCorrectionBytes = errorCorrection;
+  }
+
+  public ByteArray getDataBytes() {
+    return dataBytes;
+  }
+
+  public ByteArray getErrorCorrectionBytes() {
+    return errorCorrectionBytes;
+  }
+
+}

diff --git a/core/src/com/google/zxing/qrcode/encoder/Encoder.java b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
index 6d59f32..55c1bca 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/Encoder.java
+++ b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
@@ -63,26 +63,6 @@ public final class Encoder {
     return penalty;
   }
 
-  private static final class BlockPair {
-
-    private final ByteArray dataBytes;
-    private final ByteArray errorCorrectionBytes;
-
-    BlockPair(ByteArray data, ByteArray errorCorrection) {
-      dataBytes = data;
-      errorCorrectionBytes = errorCorrection;
-    }
-
-    public ByteArray getDataBytes() {
-      return dataBytes;
-    }
-
-    public ByteArray getErrorCorrectionBytes() {
-      return errorCorrectionBytes;
-    }
-
-  }
-
   /**
    *  Encode "bytes" with the error correction level "ecLevel". The encoding mode will be chosen
    * internally by chooseMode(). On success, store the result in "qrCode".