修复某些图片无法识别的问题

Author: devilsen

czxing/src/main/cpp/JNIUtils.cpp

@@ -126,7 +126,8 @@ BitmapToMat(JNIEnv *env, jobject bitmap, cv::Mat &mat) {
         } else {
             // info.format == ANDROID_BITMAP_FORMAT_RGB_565
             LOGE("nBitmapToMat: RGB_565 -> CV_8UC4");
-            cv::Mat tmp(bmInfo.height, bmInfo.width, CV_8UC2, pixels);
+            cv::Mat tmp(bmInfo.height, bmInfo.width, CV_8UC4, pixels);
+            tmp.copyTo(dst);
         }
     } else {
         throw std::runtime_error("Failed to read bitmap's data");

czxing/src/main/java/me/devilsen/czxing/code/BarcodeReader.java

@@ -1,9 +1,11 @@
 package me.devilsen.czxing.code;
 
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.util.Log;
 
 import me.devilsen.czxing.util.BarCodeUtil;
+import me.devilsen.czxing.util.SaveImageUtil;
 
 public class BarcodeReader {
 
@@ -47,10 +49,11 @@ public CodeResult read(Bitmap bitmap) {
             BarCodeUtil.e("bitmap is null");
             return null;
         }
-        int imgWidth = bitmap.getWidth();
-        int imgHeight = bitmap.getHeight();
+        Bitmap grayBitmap = SaveImageUtil.getBinaryzationBitmap(bitmap);
+        int imgWidth = grayBitmap.getWidth();
+        int imgHeight = grayBitmap.getHeight();
         Object[] result = new Object[2];
-        int resultFormat = NativeSdk.getInstance().readBarcode(_nativePtr, bitmap, 0, 0, imgWidth, imgHeight, result);
+        int resultFormat = NativeSdk.getInstance().readBarcode(_nativePtr, grayBitmap, 0, 0, imgWidth, imgHeight, result);
         if (resultFormat >= 0) {
             CodeResult decodeResult = new CodeResult(BarcodeFormat.values()[resultFormat], (String) result[0]);
             if (result[1] != null) {

czxing/src/main/java/me/devilsen/czxing/util/SaveImageUtil.java

@@ -106,15 +106,15 @@ private static int[] rotate(int[] data, int width, int height, int rowWidth) {
      * @return 二值化处理后的图片
      */
     public static Bitmap getBinaryzationBitmap(Bitmap bm) {
-        Bitmap bitmap = null;
+        Bitmap bitmap;
         // 获取图片的宽和高
         int width = bm.getWidth();
         int height = bm.getHeight();
         // 创建二值化图像
         bitmap = bm.copy(Bitmap.Config.ARGB_8888, true);
         // 遍历原始图像像素,并进行二值化处理
-        for (int i = 0; i < height; i++) {
-            for (int j = 0; j < width; j++) {
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
                 // 得到当前的像素值
                 int pixel = bitmap.getPixel(i, j);
                 // 得到Alpha通道的值

sample/build.gradle

@@ -57,8 +57,8 @@ android {
 dependencies {
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
-//    implementation project(':czxing')
-    implementation 'me.devilsen:CZXing:0.9.9'
+    implementation project(':czxing')
+//    implementation 'me.devilsen:CZXing:0.9.9'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit