From 8fcb50f4f4408b7c56bb98f94ef0f70e14d8cdfb Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Thu, 9 Jan 2025 19:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8B=8D=E7=85=A7=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E4=B8=A4=E4=B8=AAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/MpPreview.cpp                                | 4 +++-
 .../main/java/com/xypower/mppreview/Camera2RawFragment.java   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/cpp/MpPreview.cpp b/app/src/main/cpp/MpPreview.cpp
index 978680c..0bdb516 100644
--- a/app/src/main/cpp/MpPreview.cpp
+++ b/app/src/main/cpp/MpPreview.cpp
@@ -147,6 +147,7 @@ namespace cv2
                 LUT(images[i], log_response, response_img);
                 split(response_img, splitted);
                 for(int c = 0; c < channels; c++) {
+                    //这里崩溃
                     result_split[c] += w.mul(splitted[c] - exp_values.at<float>((int)i));
                 }
                 weight_sum += w;
@@ -262,7 +263,8 @@ namespace cv2
                 Mat adapt = color_adapt * channels[i] + (1.0f - color_adapt) * gray_img;
                 adapt = light_adapt * adapt + (1.0f - light_adapt) * global;
                 pow(intensity * adapt, map_key, adapt);
-                channels[i] = channels[i].mul(1.0f / (adapt + channels[i]));
+                //这里崩溃
+                channels[i] = channels[i].mul(1.0f/(adapt + channels[i]));
             }
             gray_img.release();
             merge(channels, img);
diff --git a/app/src/main/java/com/xypower/mppreview/Camera2RawFragment.java b/app/src/main/java/com/xypower/mppreview/Camera2RawFragment.java
index 45b5a0c..b37e4fa 100644
--- a/app/src/main/java/com/xypower/mppreview/Camera2RawFragment.java
+++ b/app/src/main/java/com/xypower/mppreview/Camera2RawFragment.java
@@ -1117,7 +1117,9 @@ public class Camera2RawFragment extends Fragment {
                                 }
                                 ImageSaver.ImageInfo img1 = images.get(0);
                                 ImageSaver.ImageInfo img2 = images.get(1);
+                                Log.d("开始Hdr处理", "strat");
                                 boolean b = makeHdr3(img1.exposureTime, img1.bitmap, img1.length, img2.exposureTime, img2.bitmap, img2.length, outputPath + "HDR_" + generateTimestamp() + ".jpg");
+                                Log.d("结束Hdr处理", "end");
                                 if (b) {
                                     showToast("HDR拍摄成功");
                                 }