From c788dc4bd94a88b00cce8b1d2c3bff5c142f171e Mon Sep 17 00:00:00 2001
From: divenswu <divenswu@163.com>
Date: Mon, 22 Jan 2024 19:01:11 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E7=94=B1=E4=BA=8EO?=
 =?UTF-8?q?penCV3.4=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/models/InsightAttributeDetection.java     |  4 ++--
 .../core/models/InsightCoordFaceKeyPoint.java      |  4 ++--
 .../core/models/PcnNetworkFaceDetection.java       | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/face-search-core/src/main/java/com/visual/face/search/core/models/InsightAttributeDetection.java b/face-search-core/src/main/java/com/visual/face/search/core/models/InsightAttributeDetection.java
index 79dbbc7..40ecf19 100644
--- a/face-search-core/src/main/java/com/visual/face/search/core/models/InsightAttributeDetection.java
+++ b/face-search-core/src/main/java/com/visual/face/search/core/models/InsightAttributeDetection.java
@@ -44,8 +44,8 @@ public class InsightAttributeDetection extends BaseOnnxInfer implements FaceAttr
         OrtSession.Result output = null;
         try {
             Mat image = imageMat.toCvMat();
-            int w = image.size(1);
-            int h = image.size(0);
+            int w = image.width();
+            int h = image.height();
             float cx = 1.0f * w / 2;
             float cy = 1.0f * h / 2;
             float[]center = new float[]{cx, cy};
diff --git a/face-search-core/src/main/java/com/visual/face/search/core/models/InsightCoordFaceKeyPoint.java b/face-search-core/src/main/java/com/visual/face/search/core/models/InsightCoordFaceKeyPoint.java
index 82bf04f..208f791 100755
--- a/face-search-core/src/main/java/com/visual/face/search/core/models/InsightCoordFaceKeyPoint.java
+++ b/face-search-core/src/main/java/com/visual/face/search/core/models/InsightCoordFaceKeyPoint.java
@@ -42,8 +42,8 @@ public class InsightCoordFaceKeyPoint extends BaseOnnxInfer implements FaceKeyPo
         OrtSession.Result output = null;
         try {
             Mat image = imageMat.toCvMat();
-            int w = image.size(1);
-            int h = image.size(0);
+            int w = image.width();
+            int h = image.height();
             float cx = 1.0f * w / 2;
             float cy = 1.0f * h / 2;
             float[]center = new float[]{cx, cy};
diff --git a/face-search-core/src/main/java/com/visual/face/search/core/models/PcnNetworkFaceDetection.java b/face-search-core/src/main/java/com/visual/face/search/core/models/PcnNetworkFaceDetection.java
index e00d536..8ea4ba6 100755
--- a/face-search-core/src/main/java/com/visual/face/search/core/models/PcnNetworkFaceDetection.java
+++ b/face-search-core/src/main/java/com/visual/face/search/core/models/PcnNetworkFaceDetection.java
@@ -288,8 +288,8 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
     private static List<FaceInfo> trans_window(Mat img, Mat imgPad, List<Window2> winlist, float scale){
         List<FaceInfo> ret = new ArrayList<>();
         try {
-            int row = (imgPad.size(0) - img.size(0)) / 2;
-            int col = (imgPad.size(1) - img.size(1)) / 2;
+            int row = (imgPad.height() - img.height()) / 2;
+            int col = (imgPad.width() - img.width()) / 2;
             for(Window2 win : winlist){
                 if( win.w > 0 && win.h > 0){
                     int x1 = win.x - col;
@@ -304,8 +304,8 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
                     int h = Math.abs(y2 - y1);
                     x1 = Math.max(Float.valueOf((x1 - (int)(w * rw)) * scale).intValue(), 1);
                     y1 = Math.max(Float.valueOf((y1 - (int)(h * rh)) * scale).intValue(), 1);
-                    x2 = Math.min(Float.valueOf((x2 + (int)(w * rw)) * scale).intValue(), Float.valueOf((img.size(1)) * scale).intValue()-1);
-                    y2 = Math.min(Float.valueOf((y2 + (int)(h * rh)) * scale).intValue(), Float.valueOf((img.size(0)) * scale).intValue()-1);
+                    x2 = Math.min(Float.valueOf((x2 + (int)(w * rw)) * scale).intValue(), Float.valueOf((img.width()) * scale).intValue()-1);
+                    y2 = Math.min(Float.valueOf((y2 + (int)(h * rh)) * scale).intValue(), Float.valueOf((img.height()) * scale).intValue()-1);
                     //构建人脸信息
                     FaceInfo faceInfo = FaceInfo.build(win.conf, angle, FaceInfo.FaceBox.build(x1, y1, x2, y2), FaceInfo.Points.build());
                     ret.add(faceInfo);
@@ -412,7 +412,7 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
         OnnxTensor input = null;
         OrtSession.Result output = null;
         Size size = img.size();
-        int height = img.size(0);
+        int height = img.height();
         try {
             datalist = Mats.build();
             for(Window2 win : winlist){
@@ -529,8 +529,8 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
         OnnxTensor input = null;
         OrtSession.Result output = null;
 
-        int height = imgPad.size(0);
-        int width  = imgPad.size(1);
+        int height = imgPad.height();
+        int width  = imgPad.width();
         Size imgPadSize = imgPad.size();
         Size img180Size = img180.size();
         Size img90Size = img90.size();