[refactoring] reuse parameter dotsPerPixel

flyingsaucerproject · Dec 30, 2023 · 3289eed · 3289eed
1 parent b575161
commit 3289eed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/flying-saucer-pdf-itext5/src/main/java/org/xhtmlrenderer/pdf/ITextUserAgent.java b/flying-saucer-pdf-itext5/src/main/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
@@ -51,7 +51,7 @@ public ITextUserAgent(ITextOutputDevice outputDevice, int dotsPerPixel) {
         _outputDevice = outputDevice;
     }
 
-    public int getDotsPerPixel() {
+    int getDotsPerPixel() {
         return dotsPerPixel;
     }
 

diff --git a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextRenderer.java b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextRenderer.java
@@ -120,7 +120,7 @@ public ITextRenderer(float dotsPerPoint, int dotsPerPixel, FontResolver fontReso
     }
 
     public ITextRenderer(ITextOutputDevice outputDevice, ITextUserAgent userAgent) {
-        this(outputDevice.getDotsPerPoint(), DEFAULT_DOTS_PER_PIXEL, outputDevice, userAgent, new ITextFontResolver());
+        this(outputDevice.getDotsPerPoint(), userAgent.getDotsPerPixel(), outputDevice, userAgent, new ITextFontResolver());
     }
 
     public ITextRenderer(float dotsPerPoint, int dotsPerPixel, ITextOutputDevice outputDevice) {

diff --git a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextUserAgent.java b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
@@ -54,6 +54,10 @@ public ITextUserAgent(ITextOutputDevice outputDevice, int dotsPerPixel) {
         this.dotsPerPixel = dotsPerPixel;
     }
 
+    int getDotsPerPixel() {
+        return dotsPerPixel;
+    }
+
     @Override
     public ImageResource getImageResource(String uriStr) {
         String unresolvedUri = uriStr;
@@ -70,8 +74,8 @@ public ImageResource getImageResource(String uriStr) {
                 InputStream is = resolveAndOpenStream(uriStr);
                 if (is != null) {
                     try {
-                        ContentTypeDetectingInputStreamWrapper cis=new ContentTypeDetectingInputStreamWrapper(is);
-                        is=cis;
+                        ContentTypeDetectingInputStreamWrapper cis = new ContentTypeDetectingInputStreamWrapper(is);
+                        is = cis;
                         if (cis.isPdf()) {
                             URI uri = new URI(uriStr);
                             PdfReader reader = _outputDevice.getReader(uri);