#IQRV #comment:去除图片转换中的删除逻辑

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1677,7 +1677,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 	return 0;
 }
 
-ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefix, bool bClear)
+ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefix)
 {
 	CSimpleStringA strPath, errMsg, strOldPath;
 	ErrorCodeEnum eErr;
@@ -1685,8 +1685,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 	if (eErr != Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get [Dep] path failed!  errcode:%s.", SpStrError(eErr));
-		if (bClear)
-			DeleteZP(Bmp_SCAN);
 		return Error_Param;
 	}
 
@@ -1698,8 +1696,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		if (eErr != Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get [DepBak] Path failed！ errcode:%s.", SpStrError(eErr));
-			if (bClear)
-				DeleteZP(Bmp_SCAN);
 			return Error_Param;
 		}
 		strOldPath = strOldPath + SPLIT_SLASH_STR + fileNamePrefix;
@@ -1712,7 +1708,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		}
 	}
 
-
 	IplImage *src = cvLoadImage(strPath + ".bmp");
 	if (!src)
 	{
@@ -1726,8 +1721,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		{
 			transImgMsg = errMsg;
 		}
-		if (bClear)
-			DeleteZP(Bmp_SCAN);
 
 		cvReleaseImage(&src);
 		return Error_Unexpect;
@@ -1741,8 +1734,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		data.Alloc(flen);
 		fread(data.m_pData, 1, flen, fp);
 		fclose(fp);
-		if (bClear)
-			DeleteZP(Bmp_SCAN);
 
 		cvReleaseImage(&src);
 		return Error_Succeed;
@@ -1758,8 +1749,6 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		{
 			transImgMsg = errMsg;
 		}
-		if (bClear)
-			DeleteZP(Bmp_SCAN);
 
 		cvReleaseImage(&src);
 		return Error_IO;

Module/mod_IDCertificate/IDCertFSM.h

@@ -256,7 +256,7 @@ public:
 private:
 	ErrorCodeEnum GetVendorDllPath(CSimpleStringA &strPath);
 	//ErrorCodeEnum GetPngBlob(CBlob &data,bool bClear=false);
-	ErrorCodeEnum GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefix,bool bClear=false);
+	ErrorCodeEnum GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefix);
 	//type:1,delete img about zp; type:2,delete img about scan ID;type:3,delete both zp and scan ID
 	//deleteTiming:0, defalut; deleteTiming:1, delete before Read IDCard; deleteTiming:2, delete after Read IDCard
 	void DeleteZP(int type, int deleteTiming = 0);