无

eyemLib-Sharp/EyemLib.cs

@@ -1233,7 +1233,6 @@ namespace eyemLib_Sharp
                 Console.WriteLine("读图失败！");
                 Console.WriteLine("读图失败！");
                 return;
                 return;
             }
             }
-
             Stopwatch sw = new Stopwatch();
             Stopwatch sw = new Stopwatch();
             sw.Restart();
             sw.Restart();
             string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2];
             string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2];
@@ -1301,7 +1300,7 @@ namespace eyemLib_Sharp
             //tpHsvModel.dpRangeL = new double[] { 100, 43, 46 }; tpHsvModel.dpRangeU = new double[] { 124, 255, 255 };
             //tpHsvModel.dpRangeL = new double[] { 100, 43, 46 }; tpHsvModel.dpRangeU = new double[] { 124, 255, 255 };
             //tpHsvModel.dpRangeLExt = new double[] { 0, 0, 0 }; tpHsvModel.dpRangeUExt = new double[] { 0, 0, 0 };
             //tpHsvModel.dpRangeLExt = new double[] { 0, 0, 0 }; tpHsvModel.dpRangeUExt = new double[] { 0, 0, 0 };
             //eyemClassifier(image);
             //eyemClassifier(image);
-            flag = eyemLibImpl(image, out tpDstImg);
+            //flag = eyemLibImpl(image, out tpDstImg);
             //float[] fFeatures = new float[512];
             //float[] fFeatures = new float[512];
             //eyemExtractWithONNX(image, fFeatures);
             //eyemExtractWithONNX(image, fFeatures);
             //string ftrs = string.Join(" ", fFeatures).Trim();
             //string ftrs = string.Join(" ", fFeatures).Trim();
@@ -1322,9 +1321,9 @@ namespace eyemLib_Sharp
             //    bitmap.Save("D:\\ResOut\\" + file);
             //    bitmap.Save("D:\\ResOut\\" + file);
             //}
             //}
             //eyemImageFree(ref tpMatchImg);
             //eyemImageFree(ref tpMatchImg);
-            eyemImageFree(ref tpDstImg);
-            eyemImageFree(ref image);
-            return;
+            //eyemImageFree(ref tpDstImg);
+            //eyemImageFree(ref image);
+            //return;
 
 
             //EyemImage templ, search;
             //EyemImage templ, search;
             //flag = eyemImageRead("D://批量测试图像//template.png", -1, out templ);
             //flag = eyemImageRead("D://批量测试图像//template.png", -1, out templ);
@@ -1630,7 +1629,7 @@ namespace eyemLib_Sharp
                 bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
                 bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
             }
             }
 
 
-            //< 解码测试
+            ////< 解码测试
             //int ipNum; EyemBarCode* tpResults;
             //int ipNum; EyemBarCode* tpResults;
             //DataCodeHandle hObject;
             //DataCodeHandle hObject;
             //int iRes = eyemDetectAndDecode(image, tpRoi, file.Replace(".png", ""), "QR_CODE|DATA_MATRIX", out hObject, out tpResults, out ipNum, false, 11, 5, 128, 256);
             //int iRes = eyemDetectAndDecode(image, tpRoi, file.Replace(".png", ""), "QR_CODE|DATA_MATRIX", out hObject, out tpResults, out ipNum, false, 11, 5, 128, 256);

eyemLib/eyemCodeDetector.cpp

@@ -62,6 +62,7 @@ std::vector<std::string> CodeDetector::detectAndDecode(cv::InputArray img, std::
 	}
 	}
 	logger.t("__eyemDetectAndDecodeUseNN__detectAndDecode__:图像格式转换完成");
 	logger.t("__eyemDetectAndDecodeUseNN__detectAndDecode__:图像格式转换完成");
 	_mtx.lock();
 	_mtx.lock();
+	int x = 0;
 	//识别
 	//识别
 	logger.t("__eyemDetectAndDecodeUseNN__detectAndDecode__:开始识别二维码");
 	logger.t("__eyemDetectAndDecodeUseNN__detectAndDecode__:开始识别二维码");
 	std::vector<cv::Rect> bboxes = p->detect(input);
 	std::vector<cv::Rect> bboxes = p->detect(input);

eyemLib/eyemLib.h

@@ -935,7 +935,6 @@ extern "C" {
 	EXPORTS int				eyemDrawCircle(EyemImage tpImage, EyemOcsDXYR tpCircle);
 	EXPORTS int				eyemDrawCircle(EyemImage tpImage, EyemOcsDXYR tpCircle);
 	EXPORTS int				eyemDrawRectangle(EyemImage tpImag, EyemRect tpRect);
 	EXPORTS int				eyemDrawRectangle(EyemImage tpImag, EyemRect tpRect);
 	EXPORTS int				eyemTrainImageSampler(EyemImage tpImage, int iSize, const char *ccClassName, const char *ccToPath, EyemImage *tpMatchImg, EyemImage *tpDstImg);
 	EXPORTS int				eyemTrainImageSampler(EyemImage tpImage, int iSize, const char *ccClassName, const char *ccToPath, EyemImage *tpMatchImg, EyemImage *tpDstImg);
-	EXPORTS int				eyemBuildTrainFile(const char *filePath, const char *fileName, bool shuffle = true);
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus
 }
 }