Browse Source

Minor chagnes.

sdk-team 5 years ago
parent
commit
58b398b978

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-12-22 Version: patch
+- Minor chagnes.
+
 2020-12-22 Version: patch
 - Generated 2020-05-18 for `dataworks-public`.
 

+ 0 - 2
imm/include/alibabacloud/imm/model/DetectImageFacesResult.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 						std::string beard;
 						float beardConfidence;
 						HeadPose headPose;
-						std::string race;
-						float raceConfidence;
 						std::string glasses;
 						std::string mask;
 						float maskConfidence;

+ 1 - 3
imm/include/alibabacloud/imm/model/FindImagesResult.h

@@ -100,8 +100,6 @@ namespace AlibabaCloud
 							std::string beard;
 							float beardConfidence;
 							HeadPose headPose;
-							float raceConfidence;
-							std::string race;
 							std::string glasses;
 							float maskConfidence;
 							std::string mask;
@@ -132,7 +130,7 @@ namespace AlibabaCloud
 						struct OCRBoundary
 						{
 							int left;
-							int left1;
+							int top;
 							int height;
 							int width;
 						};

+ 0 - 2
imm/include/alibabacloud/imm/model/GetImageResult.h

@@ -88,8 +88,6 @@ namespace AlibabaCloud
 						std::string beard;
 						float beardConfidence;
 						HeadPose headPose;
-						std::string race;
-						float raceConfidence;
 						std::string glasses;
 						std::string mask;
 						float maskConfidence;

+ 1 - 3
imm/include/alibabacloud/imm/model/ListImagesResult.h

@@ -100,8 +100,6 @@ namespace AlibabaCloud
 							std::string beard;
 							float beardConfidence;
 							HeadPose headPose;
-							float raceConfidence;
-							std::string race;
 							std::string glasses;
 							float maskConfidence;
 							std::string mask;
@@ -132,7 +130,7 @@ namespace AlibabaCloud
 						struct OCRBoundary
 						{
 							int left;
-							int left1;
+							int top;
 							int height;
 							int width;
 						};

+ 0 - 2
imm/include/alibabacloud/imm/model/ListVideoFramesResult.h

@@ -65,8 +65,6 @@ namespace AlibabaCloud
 							std::string beard;
 							float beardConfidence;
 							HeadPose headPose;
-							float raceConfidence;
-							std::string race;
 							std::string glasses;
 							float maskConfidence;
 							std::string mask;

+ 0 - 4
imm/src/model/DetectImageFacesResult.cc

@@ -70,16 +70,12 @@ void DetectImageFacesResult::parse(const std::string &payload)
 			facesObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
 		if(!faceAttributesNode["Beard"].isNull())
 			facesObject.faceAttributes.beard = faceAttributesNode["Beard"].asString();
-		if(!faceAttributesNode["Race"].isNull())
-			facesObject.faceAttributes.race = faceAttributesNode["Race"].asString();
 		if(!faceAttributesNode["Mask"].isNull())
 			facesObject.faceAttributes.mask = faceAttributesNode["Mask"].asString();
 		if(!faceAttributesNode["GlassesConfidence"].isNull())
 			facesObject.faceAttributes.glassesConfidence = std::stof(faceAttributesNode["GlassesConfidence"].asString());
 		if(!faceAttributesNode["BeardConfidence"].isNull())
 			facesObject.faceAttributes.beardConfidence = std::stof(faceAttributesNode["BeardConfidence"].asString());
-		if(!faceAttributesNode["RaceConfidence"].isNull())
-			facesObject.faceAttributes.raceConfidence = std::stof(faceAttributesNode["RaceConfidence"].asString());
 		if(!faceAttributesNode["MaskConfidence"].isNull())
 			facesObject.faceAttributes.maskConfidence = std::stof(faceAttributesNode["MaskConfidence"].asString());
 		auto faceBoundaryNode = faceAttributesNode["FaceBoundary"];

+ 2 - 6
imm/src/model/FindImagesResult.cc

@@ -190,14 +190,10 @@ void FindImagesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.glassesConfidence = std::stof(faceAttributesNode["GlassesConfidence"].asString());
 			if(!faceAttributesNode["Glasses"].isNull())
 				facesObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
-			if(!faceAttributesNode["RaceConfidence"].isNull())
-				facesObject.faceAttributes.raceConfidence = std::stof(faceAttributesNode["RaceConfidence"].asString());
 			if(!faceAttributesNode["Beard"].isNull())
 				facesObject.faceAttributes.beard = faceAttributesNode["Beard"].asString();
 			if(!faceAttributesNode["MaskConfidence"].isNull())
 				facesObject.faceAttributes.maskConfidence = std::stof(faceAttributesNode["MaskConfidence"].asString());
-			if(!faceAttributesNode["Race"].isNull())
-				facesObject.faceAttributes.race = faceAttributesNode["Race"].asString();
 			if(!faceAttributesNode["BeardConfidence"].isNull())
 				facesObject.faceAttributes.beardConfidence = std::stof(faceAttributesNode["BeardConfidence"].asString());
 			if(!faceAttributesNode["Mask"].isNull())
@@ -245,8 +241,8 @@ void FindImagesResult::parse(const std::string &payload)
 			auto oCRBoundaryNode = value["OCRBoundary"];
 			if(!oCRBoundaryNode["Left"].isNull())
 				oCRObject.oCRBoundary.left = std::stoi(oCRBoundaryNode["Left"].asString());
-			if(!oCRBoundaryNode["Left"].isNull())
-				oCRObject.oCRBoundary.left1 = std::stoi(oCRBoundaryNode["Left"].asString());
+			if(!oCRBoundaryNode["Top"].isNull())
+				oCRObject.oCRBoundary.top = std::stoi(oCRBoundaryNode["Top"].asString());
 			if(!oCRBoundaryNode["Width"].isNull())
 				oCRObject.oCRBoundary.width = std::stoi(oCRBoundaryNode["Width"].asString());
 			if(!oCRBoundaryNode["Height"].isNull())

+ 0 - 4
imm/src/model/GetImageResult.cc

@@ -87,16 +87,12 @@ void GetImageResult::parse(const std::string &payload)
 			facesObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
 		if(!faceAttributesNode["Beard"].isNull())
 			facesObject.faceAttributes.beard = faceAttributesNode["Beard"].asString();
-		if(!faceAttributesNode["Race"].isNull())
-			facesObject.faceAttributes.race = faceAttributesNode["Race"].asString();
 		if(!faceAttributesNode["Mask"].isNull())
 			facesObject.faceAttributes.mask = faceAttributesNode["Mask"].asString();
 		if(!faceAttributesNode["GlassesConfidence"].isNull())
 			facesObject.faceAttributes.glassesConfidence = std::stof(faceAttributesNode["GlassesConfidence"].asString());
 		if(!faceAttributesNode["BeardConfidence"].isNull())
 			facesObject.faceAttributes.beardConfidence = std::stof(faceAttributesNode["BeardConfidence"].asString());
-		if(!faceAttributesNode["RaceConfidence"].isNull())
-			facesObject.faceAttributes.raceConfidence = std::stof(faceAttributesNode["RaceConfidence"].asString());
 		if(!faceAttributesNode["MaskConfidence"].isNull())
 			facesObject.faceAttributes.maskConfidence = std::stof(faceAttributesNode["MaskConfidence"].asString());
 		auto faceBoundaryNode = faceAttributesNode["FaceBoundary"];

+ 2 - 6
imm/src/model/ListImagesResult.cc

@@ -190,14 +190,10 @@ void ListImagesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.glassesConfidence = std::stof(faceAttributesNode["GlassesConfidence"].asString());
 			if(!faceAttributesNode["Glasses"].isNull())
 				facesObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
-			if(!faceAttributesNode["RaceConfidence"].isNull())
-				facesObject.faceAttributes.raceConfidence = std::stof(faceAttributesNode["RaceConfidence"].asString());
 			if(!faceAttributesNode["Beard"].isNull())
 				facesObject.faceAttributes.beard = faceAttributesNode["Beard"].asString();
 			if(!faceAttributesNode["MaskConfidence"].isNull())
 				facesObject.faceAttributes.maskConfidence = std::stof(faceAttributesNode["MaskConfidence"].asString());
-			if(!faceAttributesNode["Race"].isNull())
-				facesObject.faceAttributes.race = faceAttributesNode["Race"].asString();
 			if(!faceAttributesNode["BeardConfidence"].isNull())
 				facesObject.faceAttributes.beardConfidence = std::stof(faceAttributesNode["BeardConfidence"].asString());
 			if(!faceAttributesNode["Mask"].isNull())
@@ -245,8 +241,8 @@ void ListImagesResult::parse(const std::string &payload)
 			auto oCRBoundaryNode = value["OCRBoundary"];
 			if(!oCRBoundaryNode["Left"].isNull())
 				oCRObject.oCRBoundary.left = std::stoi(oCRBoundaryNode["Left"].asString());
-			if(!oCRBoundaryNode["Left"].isNull())
-				oCRObject.oCRBoundary.left1 = std::stoi(oCRBoundaryNode["Left"].asString());
+			if(!oCRBoundaryNode["Top"].isNull())
+				oCRObject.oCRBoundary.top = std::stoi(oCRBoundaryNode["Top"].asString());
 			if(!oCRBoundaryNode["Width"].isNull())
 				oCRObject.oCRBoundary.width = std::stoi(oCRBoundaryNode["Width"].asString());
 			if(!oCRBoundaryNode["Height"].isNull())

+ 0 - 4
imm/src/model/ListVideoFramesResult.cc

@@ -149,14 +149,10 @@ void ListVideoFramesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.glassesConfidence = std::stof(faceAttributesNode["GlassesConfidence"].asString());
 			if(!faceAttributesNode["Glasses"].isNull())
 				facesObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
-			if(!faceAttributesNode["RaceConfidence"].isNull())
-				facesObject.faceAttributes.raceConfidence = std::stof(faceAttributesNode["RaceConfidence"].asString());
 			if(!faceAttributesNode["Beard"].isNull())
 				facesObject.faceAttributes.beard = faceAttributesNode["Beard"].asString();
 			if(!faceAttributesNode["MaskConfidence"].isNull())
 				facesObject.faceAttributes.maskConfidence = std::stof(faceAttributesNode["MaskConfidence"].asString());
-			if(!faceAttributesNode["Race"].isNull())
-				facesObject.faceAttributes.race = faceAttributesNode["Race"].asString();
 			if(!faceAttributesNode["BeardConfidence"].isNull())
 				facesObject.faceAttributes.beardConfidence = std::stof(faceAttributesNode["BeardConfidence"].asString());
 			if(!faceAttributesNode["Mask"].isNull())