Skip to content

V25.6 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alekseysemenchenko merged 2 commits into from
Nov 11, 2025
Merged

V25.6 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e6d722
v25.6 and fix
alekseysemenchenko Nov 11, 2025
1447905
Merge branch 'master' of https://github.com/groupdocs-annotation/Grou…
alekseysemenchenko Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Demos/Spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>com.groupdocs</groupId>
<artifactId>groupdocs-annotation</artifactId>
<version>24.6</version>
<version>25.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/BaseAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected BaseAnnotator(AnnotationDataEntity annotationData, PageInfo pageInfo)
*/
protected final AnnotationBase initAnnotationBase(AnnotationBase annotationBase) {
// set page number to add annotation
annotationBase.setPageNumber(annotationData.getPageNumber() - 1);
annotationBase.setPageNumber(annotationData.getPageNumber());//-1
// set annotation type
annotationBase.setType(getType());
annotationBase.setCreatedOn(Date.from(Instant.now()));
Expand Down
4 changes: 2 additions & 2 deletions Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public AnnotatedDocumentEntity annotate(AnnotationPostedDataEntity annotateDocum

for (int i = 0; i < annotationsData.length; i++) {
AnnotationDataEntity annotationData = annotationsData[i];
PageInfo pageInfo = info.getPagesInfo().get(annotationsData[i].getPageNumber() - 1);
PageInfo pageInfo = info.getPagesInfo().get(annotationsData[i].getPageNumber() - 1);//-1
// add annotation, if current annotation type isn't supported by the current document type it will be ignored
try {
BaseAnnotator baseAnnotator = AnnotatorFactory.createAnnotator(annotationData, pageInfo);
Expand Down Expand Up @@ -507,7 +507,7 @@ public List<AnnotationBase> getAnnotationInfos(AnnotationPostedDataEntity annota
for (AnnotationDataEntity annotationData : annotationsData) {
// create annotator
// add annotation, if current annotation type isn't supported by the current document type it will be ignored
PageDataDescriptionEntity pageData = annotationPageDescriptionEntityList.get(annotationData.getPageNumber() - 1);
PageDataDescriptionEntity pageData = annotationPageDescriptionEntityList.get(annotationData.getPageNumber() - 1);//-1

PageInfo pageInfo = new PageInfo();
pageInfo.setHeight((int) pageData.getHeight());
Expand Down
4 changes: 2 additions & 2 deletions Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static List<AnnotationDataEntity> mapForPage(List<AnnotationBase> annotat
// GroupDocs.Annotation library are obfuscated
for (int n = 0; n < annotations.size(); n++) {
AnnotationBase annotationInfo = annotations.get(n);
if (pageNumber == annotationInfo.getPageNumber() + 1) {
if (pageNumber == annotationInfo.getPageNumber()) {//+1
AnnotationDataEntity annotation = mapAnnotationDataEntity(annotationInfo, pageInfo);
pageAnnotations.add(annotation);
}
Expand Down Expand Up @@ -109,7 +109,7 @@ public static AnnotationDataEntity mapAnnotationDataEntity(AnnotationBase annota
annotation.setHeight(annotationInfo instanceof IBox ? boxHeight : (annotationInfo instanceof IPoints ? (maxY - minY) : 0));
annotation.setLeft(annotationInfo instanceof IBox ? boxX : (annotationInfo instanceof IPoints ? minX : 0));

annotation.setPageNumber((int)annotationInfo.getPageNumber() + 1);
annotation.setPageNumber((int)annotationInfo.getPageNumber());//+1
annotation.setSvgPath(annotationInfo instanceof ISvgPath ? (((ISvgPath)annotationInfo).getSvgPath().replace("l", "L")) : svgPath);

String text = "";
Expand Down