format

cucumber/features/external.feature

@@ -123,7 +123,7 @@ Feature: API Validation
     | odt    | .odt      |
     | doc    | .doc      |
 
-  @ocr
+  @ocr @pdfa1
   Scenario: PDFA
     Given I use an example file at "exampleFiles/pdfa2.pdf" as parameter "fileInput"
 	And the request data includes
@@ -134,7 +134,7 @@ Feature: API Validation
     And the response file should have extension ".pdf"
     And the response file should have size greater than 100
 	
-  @ocr
+  @ocr @pdfa2
   Scenario: PDFA1
     Given I use an example file at "exampleFiles/pdfa1.pdf" as parameter "fileInput"
 	And the request data includes

src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java

@@ -175,7 +175,10 @@ public class KeygenLicenseVerifier {
             log.info("Machine activated successfully");
             return true;
         } else {
-            log.error("Error activating machine. Status code: " + response.statusCode());
+            log.error(
+                    "Error activating machine. Status code: {}, error: {}",
+                    response.statusCode(),
+                    response.body());
 
             return false;
         }

src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java

@@ -37,10 +37,8 @@ public class LicenseKeyChecker {
         log.info(applicationProperties.toString());
         log.info(applicationProperties.getEnterpriseEdition().toString());
         if (!applicationProperties.getEnterpriseEdition().isEnabled()) {
-            System.out.println("gggggg");
             enterpriseEnbaledResult = false;
         } else {
-            System.out.println("ssssssssssss");
             enterpriseEnbaledResult =
                     licenseService.verifyLicense(
                             applicationProperties.getEnterpriseEdition().getKey());

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -61,7 +61,7 @@ public class ConvertPDFToPDFA {
         command.add("-dPDFA=" + ("pdfa".equals(outputFormat) ? "2" : "1"));
         command.add("-dNOPAUSE");
         command.add("-dBATCH");
-        command.add("-sColorConversionStrategy=UseDeviceIndependentColor");
+        command.add("-sColorConversionStrategy=sRGB");
         command.add("-sDEVICE=pdfwrite");
         command.add("-dPDFACompatibilityPolicy=2");
         command.add("-o");

src/main/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategy.java

@@ -6,11 +6,12 @@ import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
 
 @Data
-// @EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public abstract class ReplaceAndInvertColorStrategy extends PDFFile {
 
     protected ReplaceAndInvert replaceAndInvert;

src/main/resources/messages_en_GB.properties

@@ -508,9 +508,9 @@ home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapte
 splitPdfByChapters.tags=split,chapters,bookmarks,organize
 
 #replace-invert-color
-replace-color.title=Replace-Invert-Color
+replace-color.title=Advanced Colour options
 replace-color.header=Replace-Invert Color PDF
-home.replaceColorPdf.title=Replace and Invert Color
+home.replaceColorPdf.title=Advanced Colour options
 home.replaceColorPdf.desc=Replace color for text and background in PDF and invert full color of pdf to reduce file size
 replaceColorPdf.tags=Replace Color,Page operations,Back end,server side
 replace-color.selectText.1=Replace or Invert color Options

src/main/resources/static/css/multi-tool.css

@@ -77,7 +77,7 @@ label {
   flex-direction: column;
   padding: 1rem;
   border-radius: 25px;
-  overflow-y: hidden;
+  overflow-y: auto;
   overflow-x: auto;
   min-height: 275px;
   margin: 0 0 30px 0;

src/main/resources/static/js/multitool/horizontalScroll.js

@@ -1,27 +1,32 @@
 const scrollDivHorizontally = (id) => {
-  var scrollDelta = 0; // variable to store the accumulated scroll delta
+  var scrollDeltaX = 0; // variable to store the accumulated horizontal scroll delta
+  var scrollDeltaY = 0; // variable to store the accumulated vertical scroll delta
   var isScrolling = false; // variable to track if scroll is already in progress
-  const divToScrollHorizontally = document.getElementById(id);
+  const divToScroll = document.getElementById(id);
+
   function scrollLoop() {
-    // Scroll the div horizontally by a fraction of the accumulated scroll delta
-    divToScrollHorizontally.scrollLeft += scrollDelta * 0.1;
+    // Scroll the div horizontally and vertically by a fraction of the accumulated scroll delta
+    divToScroll.scrollLeft += scrollDeltaX * 0.1;
+    divToScroll.scrollTop += scrollDeltaY * 0.1;
 
     // Reduce the accumulated scroll delta by a fraction
-    scrollDelta *= 0.9;
+    scrollDeltaX *= 0.9;
+    scrollDeltaY *= 0.9;
 
     // If scroll delta is still significant, continue the scroll loop
-    if (Math.abs(scrollDelta) > 0.1) {
+    if (Math.abs(scrollDeltaX) > 0.1 || Math.abs(scrollDeltaY) > 0.1) {
       requestAnimationFrame(scrollLoop);
     } else {
       isScrolling = false; // Reset scroll in progress flag
     }
   }
 
-  divToScrollHorizontally.addEventListener("wheel", function (e) {
+  divToScroll.addEventListener("wheel", function (e) {
     e.preventDefault(); // prevent default mousewheel behavior
 
-    // Accumulate the horizontal scroll delta
-    scrollDelta -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY;
+    // Accumulate the horizontal and vertical scroll delta
+    scrollDeltaX -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY;
+    scrollDeltaY -= e.deltaY || e.wheelDeltaY || -e.deltaX || -e.wheelDeltaX;
 
     // If scroll is not already in progress, start the scroll loop
     if (!isScrolling) {