From ac3e57eee888904d39a07b58ca7d57f8f8b0e51a Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Mon, 26 Mar 2018 20:37:40 +0000 Subject: Revert "Add FPDFAnnot_CountAttachmentPoints" This reverts commit ca28cb636331de447125de476decbec333fe613b. Reason for revert: broke Windows embeddertests https://build.chromium.org/p/client.pdfium/builders/windows/builds/4622 I got it when landing my CL, which is unrelated. Since this CL passed the bot, I'm guessing it's a flaky test? Original change's description: > Add FPDFAnnot_CountAttachmentPoints > > This CL adds a function to the API that returns the number of quadpoint > sets. > > Change-Id: I999bc567a4c98f6c32e87810e7ecfbb634c7b677 > Reviewed-on: https://pdfium-review.googlesource.com/29130 > Reviewed-by: Lei Zhang > Commit-Queue: Lei Zhang TBR=thestig@chromium.org,dsinclair@chromium.org,ralf.sippl@gmail.com Change-Id: Id96b5d4e18be2184c9d24f77bda7499aad0ed211 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://pdfium-review.googlesource.com/29190 Reviewed-by: Henrique Nakashima Commit-Queue: Henrique Nakashima --- fpdfsdk/fpdfannot.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'fpdfsdk/fpdfannot.cpp') diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index c52807148e..b5dccaade1 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -583,7 +583,7 @@ FPDFAnnot_HasAttachmentPoints(FPDF_ANNOTATION annot) { FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, const FS_QUADPOINTSF* quad_points) { - if (!FPDFAnnot_HasAttachmentPoints(annot) || !quad_points) + if (!annot || !quad_points || !FPDFAnnot_HasAttachmentPoints(annot)) return false; CPDF_Dictionary* pAnnotDict = @@ -621,21 +621,10 @@ FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, return true; } -FPDF_EXPORT size_t FPDF_CALLCONV -FPDFAnnot_CountAttachmentPoints(FPDF_ANNOTATION annot) { - if (!FPDFAnnot_HasAttachmentPoints(annot)) - return 0; - - CPDF_Dictionary* pAnnotDict = - CPDFAnnotContextFromFPDFAnnotation(annot)->GetAnnotDict(); - const CPDF_Array* pArray = GetQuadPointsArrayFromDictionary(pAnnotDict); - return pArray ? pArray->GetCount() / 8 : 0; -} - FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetAttachmentPoints(FPDF_ANNOTATION annot, FS_QUADPOINTSF* quad_points) { - if (!FPDFAnnot_HasAttachmentPoints(annot) || !quad_points) + if (!annot || !quad_points || !FPDFAnnot_HasAttachmentPoints(annot)) return false; return GetQuadPointsFromDictionary( -- cgit v1.2.3