sdk-team 5 лет назад
Родитель
Сommit
15efd0abf3

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-12-22 Version: patch
+- Minor chagnes.
+
 2020-12-22 Version: patch
 - Update SegmentAnimal SegmentCommonImage.
 

+ 0 - 4
imm/CMakeLists.txt

@@ -75,8 +75,6 @@ set(imm_public_header_model
 	include/alibabacloud/imm/model/DescribeRegionsResult.h
 	include/alibabacloud/imm/model/DetectImageBodiesRequest.h
 	include/alibabacloud/imm/model/DetectImageBodiesResult.h
-	include/alibabacloud/imm/model/DetectImageCelebrityRequest.h
-	include/alibabacloud/imm/model/DetectImageCelebrityResult.h
 	include/alibabacloud/imm/model/DetectImageFacesRequest.h
 	include/alibabacloud/imm/model/DetectImageFacesResult.h
 	include/alibabacloud/imm/model/DetectImageLogosRequest.h
@@ -236,8 +234,6 @@ set(imm_src
 	src/model/DescribeRegionsResult.cc
 	src/model/DetectImageBodiesRequest.cc
 	src/model/DetectImageBodiesResult.cc
-	src/model/DetectImageCelebrityRequest.cc
-	src/model/DetectImageCelebrityResult.cc
 	src/model/DetectImageFacesRequest.cc
 	src/model/DetectImageFacesResult.cc
 	src/model/DetectImageLogosRequest.cc

+ 0 - 8
imm/include/alibabacloud/imm/ImmClient.h

@@ -76,8 +76,6 @@
 #include "model/DescribeRegionsResult.h"
 #include "model/DetectImageBodiesRequest.h"
 #include "model/DetectImageBodiesResult.h"
-#include "model/DetectImageCelebrityRequest.h"
-#include "model/DetectImageCelebrityResult.h"
 #include "model/DetectImageFacesRequest.h"
 #include "model/DetectImageFacesResult.h"
 #include "model/DetectImageLogosRequest.h"
@@ -270,9 +268,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DetectImageBodiesResult> DetectImageBodiesOutcome;
 			typedef std::future<DetectImageBodiesOutcome> DetectImageBodiesOutcomeCallable;
 			typedef std::function<void(const ImmClient*, const Model::DetectImageBodiesRequest&, const DetectImageBodiesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectImageBodiesAsyncHandler;
-			typedef Outcome<Error, Model::DetectImageCelebrityResult> DetectImageCelebrityOutcome;
-			typedef std::future<DetectImageCelebrityOutcome> DetectImageCelebrityOutcomeCallable;
-			typedef std::function<void(const ImmClient*, const Model::DetectImageCelebrityRequest&, const DetectImageCelebrityOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectImageCelebrityAsyncHandler;
 			typedef Outcome<Error, Model::DetectImageFacesResult> DetectImageFacesOutcome;
 			typedef std::future<DetectImageFacesOutcome> DetectImageFacesOutcomeCallable;
 			typedef std::function<void(const ImmClient*, const Model::DetectImageFacesRequest&, const DetectImageFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectImageFacesAsyncHandler;
@@ -512,9 +507,6 @@ namespace AlibabaCloud
 			DetectImageBodiesOutcome detectImageBodies(const Model::DetectImageBodiesRequest &request)const;
 			void detectImageBodiesAsync(const Model::DetectImageBodiesRequest& request, const DetectImageBodiesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DetectImageBodiesOutcomeCallable detectImageBodiesCallable(const Model::DetectImageBodiesRequest& request) const;
-			DetectImageCelebrityOutcome detectImageCelebrity(const Model::DetectImageCelebrityRequest &request)const;
-			void detectImageCelebrityAsync(const Model::DetectImageCelebrityRequest& request, const DetectImageCelebrityAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DetectImageCelebrityOutcomeCallable detectImageCelebrityCallable(const Model::DetectImageCelebrityRequest& request) const;
 			DetectImageFacesOutcome detectImageFaces(const Model::DetectImageFacesRequest &request)const;
 			void detectImageFacesAsync(const Model::DetectImageFacesRequest& request, const DetectImageFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DetectImageFacesOutcomeCallable detectImageFacesCallable(const Model::DetectImageFacesRequest& request) const;

+ 0 - 60
imm/include/alibabacloud/imm/model/DetectImageCelebrityRequest.h

@@ -1,60 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYREQUEST_H_
-#define ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/imm/ImmExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Imm
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_IMM_EXPORT DetectImageCelebrityRequest : public RpcServiceRequest
-			{
-
-			public:
-				DetectImageCelebrityRequest();
-				~DetectImageCelebrityRequest();
-
-				std::string getProject()const;
-				void setProject(const std::string& project);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getLibrary()const;
-				void setLibrary(const std::string& library);
-				std::string getRealUid()const;
-				void setRealUid(const std::string& realUid);
-				std::string getImageUri()const;
-				void setImageUri(const std::string& imageUri);
-
-            private:
-				std::string project_;
-				std::string accessKeyId_;
-				std::string library_;
-				std::string realUid_;
-				std::string imageUri_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYREQUEST_H_

+ 0 - 68
imm/include/alibabacloud/imm/model/DetectImageCelebrityResult.h

@@ -1,68 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYRESULT_H_
-#define ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/imm/ImmExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Imm
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_IMM_EXPORT DetectImageCelebrityResult : public ServiceResult
-			{
-			public:
-				struct CelebrityItem
-				{
-					struct CelebrityBoundary
-					{
-						int left;
-						int top;
-						int height;
-						int width;
-					};
-					std::string celebrityName;
-					CelebrityBoundary celebrityBoundary;
-					std::string celebrityGender;
-					std::string celebrityLibraryName;
-					float celebrityConfidence;
-				};
-
-
-				DetectImageCelebrityResult();
-				explicit DetectImageCelebrityResult(const std::string &payload);
-				~DetectImageCelebrityResult();
-				std::vector<CelebrityItem> getCelebrity()const;
-				std::string getImageUri()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<CelebrityItem> celebrity_;
-				std::string imageUri_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_IMM_MODEL_DETECTIMAGECELEBRITYRESULT_H_

+ 16 - 35
imm/include/alibabacloud/imm/model/FindImagesResult.h

@@ -138,69 +138,50 @@ namespace AlibabaCloud
 						float oCRConfidence;
 						std::string oCRContents;
 					};
-					struct CelebrityItem
-					{
-						struct CelebrityBoundary
-						{
-							int left;
-							int top;
-							int height;
-							int width;
-						};
-						std::string celebrityName;
-						CelebrityBoundary celebrityBoundary;
-						std::string celebrityGender;
-						std::string celebrityLibraryName;
-						float celebrityConfidence;
-					};
 					ImageQuality imageQuality;
+					std::string modifyTime;
 					Address address;
 					std::string sourceType;
 					std::string sourceUri;
 					std::string facesFailReason;
+					std::string croppingSuggestionStatus;
 					std::string croppingSuggestionFailReason;
+					std::string remarksA;
 					std::string addressFailReason;
+					std::string remarksB;
+					std::string addressModifyTime;
 					std::string imageFormat;
+					std::string tagsFailReason;
 					std::string remarksArrayB;
+					std::string facesModifyTime;
 					std::string exif;
+					std::string remarksC;
+					std::string remarksD;
 					int imageWidth;
-					std::vector<ImagesItem::CelebrityItem> celebrity;
 					std::string sourcePosition;
 					std::string remarksArrayA;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::string addressStatus;
+					std::string facesStatus;
 					std::string imageQualityModifyTime;
 					std::vector<ImagesItem::CroppingSuggestionItem> croppingSuggestion;
+					std::string createTime;
+					std::string tagsModifyTime;
+					std::string externalId;
 					std::string imageQualityFailReason;
 					std::string imageUri;
 					std::string orientation;
+					std::string oCRStatus;
+					std::string oCRModifyTime;
 					std::string imageTime;
 					std::string croppingSuggestionModifyTime;
-					std::string celebrityModifyTime;
 					int imageHeight;
 					std::string tagsStatus;
 					std::string imageQualityStatus;
-					std::string celebrityFailReason;
-					std::string celebrityStatus;
-					int fileSize;
-					std::string modifyTime;
-					std::string croppingSuggestionStatus;
-					std::string remarksA;
-					std::string remarksB;
-					std::string addressModifyTime;
-					std::string tagsFailReason;
-					std::string facesModifyTime;
-					std::string remarksC;
-					std::string remarksD;
-					std::string facesStatus;
-					std::string createTime;
-					std::string tagsModifyTime;
-					std::string externalId;
-					std::string oCRStatus;
-					std::string oCRModifyTime;
 					std::string oCRFailReason;
 					std::vector<ImagesItem::OCRItem> oCR;
+					int fileSize;
 					std::string location;
 				};
 

+ 34 - 57
imm/include/alibabacloud/imm/model/GetImageResult.h

@@ -136,129 +136,106 @@ namespace AlibabaCloud
 					int tagLevel;
 					std::string parentTagName;
 				};
-				struct CelebrityItem
-				{
-					struct CelebrityBoundary
-					{
-						int left;
-						int top;
-						int height;
-						int width;
-					};
-					std::string celebrityName;
-					CelebrityBoundary celebrityBoundary;
-					std::string celebrityGender;
-					std::string celebrityLibraryName;
-					float celebrityConfidence;
-				};
 
 
 				GetImageResult();
 				explicit GetImageResult(const std::string &payload);
 				~GetImageResult();
 				ImageQuality getImageQuality()const;
+				std::string getModifyTime()const;
 				Address getAddress()const;
 				std::string getSourceType()const;
 				std::string getSourceUri()const;
 				std::string getFacesFailReason()const;
+				std::string getCroppingSuggestionStatus()const;
 				std::string getCroppingSuggestionFailReason()const;
+				std::string getRemarksA()const;
 				std::string getAddressFailReason()const;
+				std::string getRemarksB()const;
+				std::string getAddressModifyTime()const;
 				std::string getImageFormat()const;
+				std::string getTagsFailReason()const;
 				std::string getRemarksArrayB()const;
 				std::string getExif()const;
+				std::string getFacesModifyTime()const;
+				std::string getRemarksC()const;
+				std::string getRemarksD()const;
 				int getImageWidth()const;
-				std::vector<CelebrityItem> getCelebrity()const;
 				std::string getSourcePosition()const;
 				std::string getRemarksArrayA()const;
 				std::vector<FacesItem> getFaces()const;
 				std::vector<TagsItem> getTags()const;
 				std::string getAddressStatus()const;
+				std::string getFacesStatus()const;
 				std::string getImageQualityModifyTime()const;
 				std::vector<CroppingSuggestionItem> getCroppingSuggestion()const;
+				std::string getCreateTime()const;
+				std::string getTagsModifyTime()const;
+				std::string getExternalId()const;
 				std::string getImageQualityFailReason()const;
 				std::string getImageUri()const;
 				std::string getOrientation()const;
+				std::string getOCRStatus()const;
+				std::string getOCRModifyTime()const;
 				std::string getImageTime()const;
 				std::string getCroppingSuggestionModifyTime()const;
-				std::string getCelebrityModifyTime()const;
 				int getImageHeight()const;
 				std::string getTagsStatus()const;
 				std::string getImageQualityStatus()const;
-				std::string getCelebrityFailReason()const;
-				std::string getSetId()const;
-				std::string getCelebrityStatus()const;
-				int getFileSize()const;
-				std::string getModifyTime()const;
-				std::string getCroppingSuggestionStatus()const;
-				std::string getRemarksA()const;
-				std::string getRemarksB()const;
-				std::string getAddressModifyTime()const;
-				std::string getTagsFailReason()const;
-				std::string getFacesModifyTime()const;
-				std::string getRemarksC()const;
-				std::string getRemarksD()const;
-				std::string getFacesStatus()const;
-				std::string getCreateTime()const;
-				std::string getTagsModifyTime()const;
-				std::string getExternalId()const;
-				std::string getOCRStatus()const;
-				std::string getOCRModifyTime()const;
 				std::string getOCRFailReason()const;
+				std::string getSetId()const;
 				std::vector<OCRItem> getOCR()const;
+				int getFileSize()const;
 				std::string getLocation()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				ImageQuality imageQuality_;
+				std::string modifyTime_;
 				Address address_;
 				std::string sourceType_;
 				std::string sourceUri_;
 				std::string facesFailReason_;
+				std::string croppingSuggestionStatus_;
 				std::string croppingSuggestionFailReason_;
+				std::string remarksA_;
 				std::string addressFailReason_;
+				std::string remarksB_;
+				std::string addressModifyTime_;
 				std::string imageFormat_;
+				std::string tagsFailReason_;
 				std::string remarksArrayB_;
 				std::string exif_;
+				std::string facesModifyTime_;
+				std::string remarksC_;
+				std::string remarksD_;
 				int imageWidth_;
-				std::vector<CelebrityItem> celebrity_;
 				std::string sourcePosition_;
 				std::string remarksArrayA_;
 				std::vector<FacesItem> faces_;
 				std::vector<TagsItem> tags_;
 				std::string addressStatus_;
+				std::string facesStatus_;
 				std::string imageQualityModifyTime_;
 				std::vector<CroppingSuggestionItem> croppingSuggestion_;
+				std::string createTime_;
+				std::string tagsModifyTime_;
+				std::string externalId_;
 				std::string imageQualityFailReason_;
 				std::string imageUri_;
 				std::string orientation_;
+				std::string oCRStatus_;
+				std::string oCRModifyTime_;
 				std::string imageTime_;
 				std::string croppingSuggestionModifyTime_;
-				std::string celebrityModifyTime_;
 				int imageHeight_;
 				std::string tagsStatus_;
 				std::string imageQualityStatus_;
-				std::string celebrityFailReason_;
-				std::string setId_;
-				std::string celebrityStatus_;
-				int fileSize_;
-				std::string modifyTime_;
-				std::string croppingSuggestionStatus_;
-				std::string remarksA_;
-				std::string remarksB_;
-				std::string addressModifyTime_;
-				std::string tagsFailReason_;
-				std::string facesModifyTime_;
-				std::string remarksC_;
-				std::string remarksD_;
-				std::string facesStatus_;
-				std::string createTime_;
-				std::string tagsModifyTime_;
-				std::string externalId_;
-				std::string oCRStatus_;
-				std::string oCRModifyTime_;
 				std::string oCRFailReason_;
+				std::string setId_;
 				std::vector<OCRItem> oCR_;
+				int fileSize_;
 				std::string location_;
 
 			};

+ 16 - 35
imm/include/alibabacloud/imm/model/ListImagesResult.h

@@ -138,69 +138,50 @@ namespace AlibabaCloud
 						float oCRConfidence;
 						std::string oCRContents;
 					};
-					struct CelebrityItem
-					{
-						struct CelebrityBoundary
-						{
-							int left;
-							int top;
-							int height;
-							int width;
-						};
-						std::string celebrityName;
-						CelebrityBoundary celebrityBoundary;
-						std::string celebrityGender;
-						std::string celebrityLibraryName;
-						float celebrityConfidence;
-					};
 					ImageQuality imageQuality;
+					std::string modifyTime;
 					Address address;
 					std::string sourceType;
 					std::string sourceUri;
 					std::string facesFailReason;
+					std::string croppingSuggestionStatus;
 					std::string croppingSuggestionFailReason;
+					std::string remarksA;
 					std::string addressFailReason;
+					std::string remarksB;
+					std::string addressModifyTime;
 					std::string imageFormat;
+					std::string tagsFailReason;
 					std::string remarksArrayB;
+					std::string facesModifyTime;
 					std::string exif;
+					std::string remarksC;
+					std::string remarksD;
 					int imageWidth;
-					std::vector<ImagesItem::CelebrityItem> celebrity;
 					std::string sourcePosition;
 					std::string remarksArrayA;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::string addressStatus;
+					std::string facesStatus;
 					std::string imageQualityModifyTime;
 					std::vector<ImagesItem::CroppingSuggestionItem> croppingSuggestion;
+					std::string createTime;
+					std::string tagsModifyTime;
+					std::string externalId;
 					std::string imageQualityFailReason;
 					std::string imageUri;
 					std::string orientation;
+					std::string oCRStatus;
+					std::string oCRModifyTime;
 					std::string imageTime;
 					std::string croppingSuggestionModifyTime;
-					std::string celebrityModifyTime;
 					int imageHeight;
 					std::string tagsStatus;
 					std::string imageQualityStatus;
-					std::string celebrityFailReason;
-					std::string celebrityStatus;
-					int fileSize;
-					std::string modifyTime;
-					std::string croppingSuggestionStatus;
-					std::string remarksA;
-					std::string remarksB;
-					std::string addressModifyTime;
-					std::string tagsFailReason;
-					std::string facesModifyTime;
-					std::string remarksC;
-					std::string remarksD;
-					std::string facesStatus;
-					std::string createTime;
-					std::string tagsModifyTime;
-					std::string externalId;
-					std::string oCRStatus;
-					std::string oCRModifyTime;
 					std::string oCRFailReason;
 					std::vector<ImagesItem::OCRItem> oCR;
+					int fileSize;
 					std::string location;
 				};
 

+ 1 - 20
imm/include/alibabacloud/imm/model/ListVideoFramesResult.h

@@ -95,7 +95,7 @@ namespace AlibabaCloud
 						struct OCRBoundary
 						{
 							int left;
-							int left1;
+							int top;
 							int height;
 							int width;
 						};
@@ -103,21 +103,6 @@ namespace AlibabaCloud
 						float oCRConfidence;
 						std::string oCRContents;
 					};
-					struct CelebrityItem
-					{
-						struct CelebrityBoundary
-						{
-							int left;
-							int top;
-							int height;
-							int width;
-						};
-						std::string celebrityName;
-						CelebrityBoundary celebrityBoundary;
-						std::string celebrityGender;
-						std::string celebrityLibraryName;
-						float celebrityConfidence;
-					};
 					std::string modifyTime;
 					std::string sourceType;
 					std::string sourceUri;
@@ -131,7 +116,6 @@ namespace AlibabaCloud
 					std::string remarksC;
 					std::string remarksD;
 					int imageWidth;
-					std::vector<FramesItem::CelebrityItem> celebrity;
 					std::string sourcePosition;
 					std::vector<FramesItem::FacesItem> faces;
 					std::vector<FramesItem::TagsItem> tags;
@@ -144,12 +128,9 @@ namespace AlibabaCloud
 					std::string oCRStatus;
 					std::string oCRModifyTime;
 					std::string imageTime;
-					std::string celebrityModifyTime;
 					int imageHeight;
 					std::string tagsStatus;
 					std::string oCRFailReason;
-					std::string celebrityFailReason;
-					std::string celebrityStatus;
 					std::vector<FramesItem::OCRItem> oCR;
 					int fileSize;
 					std::string location;

+ 0 - 36
imm/src/ImmClient.cc

@@ -1023,42 +1023,6 @@ ImmClient::DetectImageBodiesOutcomeCallable ImmClient::detectImageBodiesCallable
 	return task->get_future();
 }
 
-ImmClient::DetectImageCelebrityOutcome ImmClient::detectImageCelebrity(const DetectImageCelebrityRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DetectImageCelebrityOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DetectImageCelebrityOutcome(DetectImageCelebrityResult(outcome.result()));
-	else
-		return DetectImageCelebrityOutcome(outcome.error());
-}
-
-void ImmClient::detectImageCelebrityAsync(const DetectImageCelebrityRequest& request, const DetectImageCelebrityAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, detectImageCelebrity(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-ImmClient::DetectImageCelebrityOutcomeCallable ImmClient::detectImageCelebrityCallable(const DetectImageCelebrityRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DetectImageCelebrityOutcome()>>(
-			[this, request]()
-			{
-			return this->detectImageCelebrity(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 ImmClient::DetectImageFacesOutcome ImmClient::detectImageFaces(const DetectImageFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 0 - 84
imm/src/model/DetectImageCelebrityRequest.cc

@@ -1,84 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/imm/model/DetectImageCelebrityRequest.h>
-
-using AlibabaCloud::Imm::Model::DetectImageCelebrityRequest;
-
-DetectImageCelebrityRequest::DetectImageCelebrityRequest() :
-	RpcServiceRequest("imm", "2017-09-06", "DetectImageCelebrity")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DetectImageCelebrityRequest::~DetectImageCelebrityRequest()
-{}
-
-std::string DetectImageCelebrityRequest::getProject()const
-{
-	return project_;
-}
-
-void DetectImageCelebrityRequest::setProject(const std::string& project)
-{
-	project_ = project;
-	setParameter("Project", project);
-}
-
-std::string DetectImageCelebrityRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DetectImageCelebrityRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string DetectImageCelebrityRequest::getLibrary()const
-{
-	return library_;
-}
-
-void DetectImageCelebrityRequest::setLibrary(const std::string& library)
-{
-	library_ = library;
-	setParameter("Library", library);
-}
-
-std::string DetectImageCelebrityRequest::getRealUid()const
-{
-	return realUid_;
-}
-
-void DetectImageCelebrityRequest::setRealUid(const std::string& realUid)
-{
-	realUid_ = realUid;
-	setParameter("RealUid", realUid);
-}
-
-std::string DetectImageCelebrityRequest::getImageUri()const
-{
-	return imageUri_;
-}
-
-void DetectImageCelebrityRequest::setImageUri(const std::string& imageUri)
-{
-	imageUri_ = imageUri;
-	setParameter("ImageUri", imageUri);
-}
-

+ 0 - 79
imm/src/model/DetectImageCelebrityResult.cc

@@ -1,79 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/imm/model/DetectImageCelebrityResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Imm;
-using namespace AlibabaCloud::Imm::Model;
-
-DetectImageCelebrityResult::DetectImageCelebrityResult() :
-	ServiceResult()
-{}
-
-DetectImageCelebrityResult::DetectImageCelebrityResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DetectImageCelebrityResult::~DetectImageCelebrityResult()
-{}
-
-void DetectImageCelebrityResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allCelebrityNode = value["Celebrity"]["CelebrityItem"];
-	for (auto valueCelebrityCelebrityItem : allCelebrityNode)
-	{
-		CelebrityItem celebrityObject;
-		if(!valueCelebrityCelebrityItem["CelebrityName"].isNull())
-			celebrityObject.celebrityName = valueCelebrityCelebrityItem["CelebrityName"].asString();
-		if(!valueCelebrityCelebrityItem["CelebrityGender"].isNull())
-			celebrityObject.celebrityGender = valueCelebrityCelebrityItem["CelebrityGender"].asString();
-		if(!valueCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-			celebrityObject.celebrityConfidence = std::stof(valueCelebrityCelebrityItem["CelebrityConfidence"].asString());
-		if(!valueCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-			celebrityObject.celebrityLibraryName = valueCelebrityCelebrityItem["CelebrityLibraryName"].asString();
-		auto celebrityBoundaryNode = value["CelebrityBoundary"];
-		if(!celebrityBoundaryNode["Left"].isNull())
-			celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());
-		if(!celebrityBoundaryNode["Top"].isNull())
-			celebrityObject.celebrityBoundary.top = std::stoi(celebrityBoundaryNode["Top"].asString());
-		if(!celebrityBoundaryNode["Width"].isNull())
-			celebrityObject.celebrityBoundary.width = std::stoi(celebrityBoundaryNode["Width"].asString());
-		if(!celebrityBoundaryNode["Height"].isNull())
-			celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
-		celebrity_.push_back(celebrityObject);
-	}
-	if(!value["ImageUri"].isNull())
-		imageUri_ = value["ImageUri"].asString();
-
-}
-
-std::vector<DetectImageCelebrityResult::CelebrityItem> DetectImageCelebrityResult::getCelebrity()const
-{
-	return celebrity_;
-}
-
-std::string DetectImageCelebrityResult::getImageUri()const
-{
-	return imageUri_;
-}
-

+ 0 - 29
imm/src/model/FindImagesResult.cc

@@ -91,12 +91,6 @@ void FindImagesResult::parse(const std::string &payload)
 			imagesObject.tagsFailReason = valueImagesImagesItem["TagsFailReason"].asString();
 		if(!valueImagesImagesItem["TagsModifyTime"].isNull())
 			imagesObject.tagsModifyTime = valueImagesImagesItem["TagsModifyTime"].asString();
-		if(!valueImagesImagesItem["CelebrityStatus"].isNull())
-			imagesObject.celebrityStatus = valueImagesImagesItem["CelebrityStatus"].asString();
-		if(!valueImagesImagesItem["CelebrityModifyTime"].isNull())
-			imagesObject.celebrityModifyTime = valueImagesImagesItem["CelebrityModifyTime"].asString();
-		if(!valueImagesImagesItem["CelebrityFailReason"].isNull())
-			imagesObject.celebrityFailReason = valueImagesImagesItem["CelebrityFailReason"].asString();
 		if(!valueImagesImagesItem["TagsStatus"].isNull())
 			imagesObject.tagsStatus = valueImagesImagesItem["TagsStatus"].asString();
 		if(!valueImagesImagesItem["RemarksC"].isNull())
@@ -249,29 +243,6 @@ void FindImagesResult::parse(const std::string &payload)
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			imagesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = valueImagesImagesItem["Celebrity"]["CelebrityItem"];
-		for (auto valueImagesImagesItemCelebrityCelebrityItem : allCelebrityNode)
-		{
-			ImagesItem::CelebrityItem celebrityObject;
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
-			auto celebrityBoundaryNode = value["CelebrityBoundary"];
-			if(!celebrityBoundaryNode["Left"].isNull())
-				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());
-			if(!celebrityBoundaryNode["Top"].isNull())
-				celebrityObject.celebrityBoundary.top = std::stoi(celebrityBoundaryNode["Top"].asString());
-			if(!celebrityBoundaryNode["Width"].isNull())
-				celebrityObject.celebrityBoundary.width = std::stoi(celebrityBoundaryNode["Width"].asString());
-			if(!celebrityBoundaryNode["Height"].isNull())
-				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
-			imagesObject.celebrity.push_back(celebrityObject);
-		}
 		auto imageQualityNode = value["ImageQuality"];
 		if(!imageQualityNode["OverallScore"].isNull())
 			imagesObject.imageQuality.overallScore = std::stof(imageQualityNode["OverallScore"].asString());

+ 78 - 127
imm/src/model/GetImageResult.cc

@@ -161,29 +161,6 @@ void GetImageResult::parse(const std::string &payload)
 			tagsObject.parentTagName = valueTagsTagsItem["ParentTagName"].asString();
 		tags_.push_back(tagsObject);
 	}
-	auto allCelebrityNode = value["Celebrity"]["CelebrityItem"];
-	for (auto valueCelebrityCelebrityItem : allCelebrityNode)
-	{
-		CelebrityItem celebrityObject;
-		if(!valueCelebrityCelebrityItem["CelebrityName"].isNull())
-			celebrityObject.celebrityName = valueCelebrityCelebrityItem["CelebrityName"].asString();
-		if(!valueCelebrityCelebrityItem["CelebrityGender"].isNull())
-			celebrityObject.celebrityGender = valueCelebrityCelebrityItem["CelebrityGender"].asString();
-		if(!valueCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-			celebrityObject.celebrityConfidence = std::stof(valueCelebrityCelebrityItem["CelebrityConfidence"].asString());
-		if(!valueCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-			celebrityObject.celebrityLibraryName = valueCelebrityCelebrityItem["CelebrityLibraryName"].asString();
-		auto celebrityBoundaryNode = value["CelebrityBoundary"];
-		if(!celebrityBoundaryNode["Left"].isNull())
-			celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());
-		if(!celebrityBoundaryNode["Top"].isNull())
-			celebrityObject.celebrityBoundary.top = std::stoi(celebrityBoundaryNode["Top"].asString());
-		if(!celebrityBoundaryNode["Width"].isNull())
-			celebrityObject.celebrityBoundary.width = std::stoi(celebrityBoundaryNode["Width"].asString());
-		if(!celebrityBoundaryNode["Height"].isNull())
-			celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
-		celebrity_.push_back(celebrityObject);
-	}
 	auto imageQualityNode = value["ImageQuality"];
 	if(!imageQualityNode["OverallScore"].isNull())
 		imageQuality_.overallScore = std::stof(imageQualityNode["OverallScore"].asString());
@@ -268,12 +245,6 @@ void GetImageResult::parse(const std::string &payload)
 		tagsFailReason_ = value["TagsFailReason"].asString();
 	if(!value["TagsModifyTime"].isNull())
 		tagsModifyTime_ = value["TagsModifyTime"].asString();
-	if(!value["CelebrityStatus"].isNull())
-		celebrityStatus_ = value["CelebrityStatus"].asString();
-	if(!value["CelebrityModifyTime"].isNull())
-		celebrityModifyTime_ = value["CelebrityModifyTime"].asString();
-	if(!value["CelebrityFailReason"].isNull())
-		celebrityFailReason_ = value["CelebrityFailReason"].asString();
 	if(!value["TagsStatus"].isNull())
 		tagsStatus_ = value["TagsStatus"].asString();
 	if(!value["RemarksC"].isNull())
@@ -312,6 +283,11 @@ GetImageResult::ImageQuality GetImageResult::getImageQuality()const
 	return imageQuality_;
 }
 
+std::string GetImageResult::getModifyTime()const
+{
+	return modifyTime_;
+}
+
 GetImageResult::Address GetImageResult::getAddress()const
 {
 	return address_;
@@ -332,21 +308,46 @@ std::string GetImageResult::getFacesFailReason()const
 	return facesFailReason_;
 }
 
+std::string GetImageResult::getCroppingSuggestionStatus()const
+{
+	return croppingSuggestionStatus_;
+}
+
 std::string GetImageResult::getCroppingSuggestionFailReason()const
 {
 	return croppingSuggestionFailReason_;
 }
 
+std::string GetImageResult::getRemarksA()const
+{
+	return remarksA_;
+}
+
 std::string GetImageResult::getAddressFailReason()const
 {
 	return addressFailReason_;
 }
 
+std::string GetImageResult::getRemarksB()const
+{
+	return remarksB_;
+}
+
+std::string GetImageResult::getAddressModifyTime()const
+{
+	return addressModifyTime_;
+}
+
 std::string GetImageResult::getImageFormat()const
 {
 	return imageFormat_;
 }
 
+std::string GetImageResult::getTagsFailReason()const
+{
+	return tagsFailReason_;
+}
+
 std::string GetImageResult::getRemarksArrayB()const
 {
 	return remarksArrayB_;
@@ -357,14 +358,24 @@ std::string GetImageResult::getExif()const
 	return exif_;
 }
 
-int GetImageResult::getImageWidth()const
+std::string GetImageResult::getFacesModifyTime()const
 {
-	return imageWidth_;
+	return facesModifyTime_;
+}
+
+std::string GetImageResult::getRemarksC()const
+{
+	return remarksC_;
 }
 
-std::vector<GetImageResult::CelebrityItem> GetImageResult::getCelebrity()const
+std::string GetImageResult::getRemarksD()const
 {
-	return celebrity_;
+	return remarksD_;
+}
+
+int GetImageResult::getImageWidth()const
+{
+	return imageWidth_;
 }
 
 std::string GetImageResult::getSourcePosition()const
@@ -392,6 +403,11 @@ std::string GetImageResult::getAddressStatus()const
 	return addressStatus_;
 }
 
+std::string GetImageResult::getFacesStatus()const
+{
+	return facesStatus_;
+}
+
 std::string GetImageResult::getImageQualityModifyTime()const
 {
 	return imageQualityModifyTime_;
@@ -402,6 +418,21 @@ std::vector<GetImageResult::CroppingSuggestionItem> GetImageResult::getCroppingS
 	return croppingSuggestion_;
 }
 
+std::string GetImageResult::getCreateTime()const
+{
+	return createTime_;
+}
+
+std::string GetImageResult::getTagsModifyTime()const
+{
+	return tagsModifyTime_;
+}
+
+std::string GetImageResult::getExternalId()const
+{
+	return externalId_;
+}
+
 std::string GetImageResult::getImageQualityFailReason()const
 {
 	return imageQualityFailReason_;
@@ -417,6 +448,16 @@ std::string GetImageResult::getOrientation()const
 	return orientation_;
 }
 
+std::string GetImageResult::getOCRStatus()const
+{
+	return oCRStatus_;
+}
+
+std::string GetImageResult::getOCRModifyTime()const
+{
+	return oCRModifyTime_;
+}
+
 std::string GetImageResult::getImageTime()const
 {
 	return imageTime_;
@@ -427,11 +468,6 @@ std::string GetImageResult::getCroppingSuggestionModifyTime()const
 	return croppingSuggestionModifyTime_;
 }
 
-std::string GetImageResult::getCelebrityModifyTime()const
-{
-	return celebrityModifyTime_;
-}
-
 int GetImageResult::getImageHeight()const
 {
 	return imageHeight_;
@@ -447,9 +483,9 @@ std::string GetImageResult::getImageQualityStatus()const
 	return imageQualityStatus_;
 }
 
-std::string GetImageResult::getCelebrityFailReason()const
+std::string GetImageResult::getOCRFailReason()const
 {
-	return celebrityFailReason_;
+	return oCRFailReason_;
 }
 
 std::string GetImageResult::getSetId()const
@@ -457,9 +493,9 @@ std::string GetImageResult::getSetId()const
 	return setId_;
 }
 
-std::string GetImageResult::getCelebrityStatus()const
+std::vector<GetImageResult::OCRItem> GetImageResult::getOCR()const
 {
-	return celebrityStatus_;
+	return oCR_;
 }
 
 int GetImageResult::getFileSize()const
@@ -467,91 +503,6 @@ int GetImageResult::getFileSize()const
 	return fileSize_;
 }
 
-std::string GetImageResult::getModifyTime()const
-{
-	return modifyTime_;
-}
-
-std::string GetImageResult::getCroppingSuggestionStatus()const
-{
-	return croppingSuggestionStatus_;
-}
-
-std::string GetImageResult::getRemarksA()const
-{
-	return remarksA_;
-}
-
-std::string GetImageResult::getRemarksB()const
-{
-	return remarksB_;
-}
-
-std::string GetImageResult::getAddressModifyTime()const
-{
-	return addressModifyTime_;
-}
-
-std::string GetImageResult::getTagsFailReason()const
-{
-	return tagsFailReason_;
-}
-
-std::string GetImageResult::getFacesModifyTime()const
-{
-	return facesModifyTime_;
-}
-
-std::string GetImageResult::getRemarksC()const
-{
-	return remarksC_;
-}
-
-std::string GetImageResult::getRemarksD()const
-{
-	return remarksD_;
-}
-
-std::string GetImageResult::getFacesStatus()const
-{
-	return facesStatus_;
-}
-
-std::string GetImageResult::getCreateTime()const
-{
-	return createTime_;
-}
-
-std::string GetImageResult::getTagsModifyTime()const
-{
-	return tagsModifyTime_;
-}
-
-std::string GetImageResult::getExternalId()const
-{
-	return externalId_;
-}
-
-std::string GetImageResult::getOCRStatus()const
-{
-	return oCRStatus_;
-}
-
-std::string GetImageResult::getOCRModifyTime()const
-{
-	return oCRModifyTime_;
-}
-
-std::string GetImageResult::getOCRFailReason()const
-{
-	return oCRFailReason_;
-}
-
-std::vector<GetImageResult::OCRItem> GetImageResult::getOCR()const
-{
-	return oCR_;
-}
-
 std::string GetImageResult::getLocation()const
 {
 	return location_;

+ 0 - 29
imm/src/model/ListImagesResult.cc

@@ -91,12 +91,6 @@ void ListImagesResult::parse(const std::string &payload)
 			imagesObject.tagsFailReason = valueImagesImagesItem["TagsFailReason"].asString();
 		if(!valueImagesImagesItem["TagsModifyTime"].isNull())
 			imagesObject.tagsModifyTime = valueImagesImagesItem["TagsModifyTime"].asString();
-		if(!valueImagesImagesItem["CelebrityStatus"].isNull())
-			imagesObject.celebrityStatus = valueImagesImagesItem["CelebrityStatus"].asString();
-		if(!valueImagesImagesItem["CelebrityModifyTime"].isNull())
-			imagesObject.celebrityModifyTime = valueImagesImagesItem["CelebrityModifyTime"].asString();
-		if(!valueImagesImagesItem["CelebrityFailReason"].isNull())
-			imagesObject.celebrityFailReason = valueImagesImagesItem["CelebrityFailReason"].asString();
 		if(!valueImagesImagesItem["TagsStatus"].isNull())
 			imagesObject.tagsStatus = valueImagesImagesItem["TagsStatus"].asString();
 		if(!valueImagesImagesItem["RemarksC"].isNull())
@@ -249,29 +243,6 @@ void ListImagesResult::parse(const std::string &payload)
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			imagesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = valueImagesImagesItem["Celebrity"]["CelebrityItem"];
-		for (auto valueImagesImagesItemCelebrityCelebrityItem : allCelebrityNode)
-		{
-			ImagesItem::CelebrityItem celebrityObject;
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
-			auto celebrityBoundaryNode = value["CelebrityBoundary"];
-			if(!celebrityBoundaryNode["Left"].isNull())
-				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());
-			if(!celebrityBoundaryNode["Top"].isNull())
-				celebrityObject.celebrityBoundary.top = std::stoi(celebrityBoundaryNode["Top"].asString());
-			if(!celebrityBoundaryNode["Width"].isNull())
-				celebrityObject.celebrityBoundary.width = std::stoi(celebrityBoundaryNode["Width"].asString());
-			if(!celebrityBoundaryNode["Height"].isNull())
-				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
-			imagesObject.celebrity.push_back(celebrityObject);
-		}
 		auto imageQualityNode = value["ImageQuality"];
 		if(!imageQualityNode["OverallScore"].isNull())
 			imagesObject.imageQuality.overallScore = std::stof(imageQualityNode["OverallScore"].asString());

+ 2 - 31
imm/src/model/ListVideoFramesResult.cc

@@ -91,12 +91,6 @@ void ListVideoFramesResult::parse(const std::string &payload)
 			framesObject.tagsFailReason = valueFramesFramesItem["TagsFailReason"].asString();
 		if(!valueFramesFramesItem["TagsModifyTime"].isNull())
 			framesObject.tagsModifyTime = valueFramesFramesItem["TagsModifyTime"].asString();
-		if(!valueFramesFramesItem["CelebrityStatus"].isNull())
-			framesObject.celebrityStatus = valueFramesFramesItem["CelebrityStatus"].asString();
-		if(!valueFramesFramesItem["CelebrityModifyTime"].isNull())
-			framesObject.celebrityModifyTime = valueFramesFramesItem["CelebrityModifyTime"].asString();
-		if(!valueFramesFramesItem["CelebrityFailReason"].isNull())
-			framesObject.celebrityFailReason = valueFramesFramesItem["CelebrityFailReason"].asString();
 		if(!valueFramesFramesItem["TagsStatus"].isNull())
 			framesObject.tagsStatus = valueFramesFramesItem["TagsStatus"].asString();
 		if(!valueFramesFramesItem["RemarksC"].isNull())
@@ -200,37 +194,14 @@ void ListVideoFramesResult::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())
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			framesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = valueFramesFramesItem["Celebrity"]["CelebrityItem"];
-		for (auto valueFramesFramesItemCelebrityCelebrityItem : allCelebrityNode)
-		{
-			FramesItem::CelebrityItem celebrityObject;
-			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = valueFramesFramesItemCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = valueFramesFramesItemCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(valueFramesFramesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = valueFramesFramesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
-			auto celebrityBoundaryNode = value["CelebrityBoundary"];
-			if(!celebrityBoundaryNode["Left"].isNull())
-				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());
-			if(!celebrityBoundaryNode["Top"].isNull())
-				celebrityObject.celebrityBoundary.top = std::stoi(celebrityBoundaryNode["Top"].asString());
-			if(!celebrityBoundaryNode["Width"].isNull())
-				celebrityObject.celebrityBoundary.width = std::stoi(celebrityBoundaryNode["Width"].asString());
-			if(!celebrityBoundaryNode["Height"].isNull())
-				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
-			framesObject.celebrity.push_back(celebrityObject);
-		}
 		frames_.push_back(framesObject);
 	}
 	if(!value["SetId"].isNull())