From 58b398b978e886cabb5a9cabe68b6b2864d316cb Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 22 Dec 2020 06:38:51 +0000 Subject: [PATCH] Minor chagnes. --- CHANGELOG | 3 +++ .../alibabacloud/imm/model/DetectImageFacesResult.h | 2 -- imm/include/alibabacloud/imm/model/FindImagesResult.h | 4 +--- imm/include/alibabacloud/imm/model/GetImageResult.h | 2 -- imm/include/alibabacloud/imm/model/ListImagesResult.h | 4 +--- .../alibabacloud/imm/model/ListVideoFramesResult.h | 2 -- imm/src/model/DetectImageFacesResult.cc | 4 ---- imm/src/model/FindImagesResult.cc | 8 ++------ imm/src/model/GetImageResult.cc | 4 ---- imm/src/model/ListImagesResult.cc | 8 ++------ imm/src/model/ListVideoFramesResult.cc | 4 ---- 11 files changed, 9 insertions(+), 36 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5bf5a2d93..52ce5a128 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-12-22 Version: patch +- Minor chagnes. + 2020-12-22 Version: patch - Generated 2020-05-18 for `dataworks-public`. diff --git a/imm/include/alibabacloud/imm/model/DetectImageFacesResult.h b/imm/include/alibabacloud/imm/model/DetectImageFacesResult.h index 480da655e..6f7c39506 100644 --- a/imm/include/alibabacloud/imm/model/DetectImageFacesResult.h +++ b/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; diff --git a/imm/include/alibabacloud/imm/model/FindImagesResult.h b/imm/include/alibabacloud/imm/model/FindImagesResult.h index d899737c8..50b2ea62f 100644 --- a/imm/include/alibabacloud/imm/model/FindImagesResult.h +++ b/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; }; diff --git a/imm/include/alibabacloud/imm/model/GetImageResult.h b/imm/include/alibabacloud/imm/model/GetImageResult.h index 18a9b2ed8..b194ee222 100644 --- a/imm/include/alibabacloud/imm/model/GetImageResult.h +++ b/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; diff --git a/imm/include/alibabacloud/imm/model/ListImagesResult.h b/imm/include/alibabacloud/imm/model/ListImagesResult.h index a77cc1277..9d253d157 100644 --- a/imm/include/alibabacloud/imm/model/ListImagesResult.h +++ b/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; }; diff --git a/imm/include/alibabacloud/imm/model/ListVideoFramesResult.h b/imm/include/alibabacloud/imm/model/ListVideoFramesResult.h index de7d1ac09..f65d00df4 100644 --- a/imm/include/alibabacloud/imm/model/ListVideoFramesResult.h +++ b/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; diff --git a/imm/src/model/DetectImageFacesResult.cc b/imm/src/model/DetectImageFacesResult.cc index 993db939b..2494808e9 100644 --- a/imm/src/model/DetectImageFacesResult.cc +++ b/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"]; diff --git a/imm/src/model/FindImagesResult.cc b/imm/src/model/FindImagesResult.cc index 6879bb512..1f86fffee 100644 --- a/imm/src/model/FindImagesResult.cc +++ b/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()) diff --git a/imm/src/model/GetImageResult.cc b/imm/src/model/GetImageResult.cc index 5db38125e..fd5b4d574 100644 --- a/imm/src/model/GetImageResult.cc +++ b/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"]; diff --git a/imm/src/model/ListImagesResult.cc b/imm/src/model/ListImagesResult.cc index f7086af9f..8df2872a5 100644 --- a/imm/src/model/ListImagesResult.cc +++ b/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()) diff --git a/imm/src/model/ListVideoFramesResult.cc b/imm/src/model/ListVideoFramesResult.cc index 66d485471..c7041cd64 100644 --- a/imm/src/model/ListVideoFramesResult.cc +++ b/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())