From 88a0a737e5a33c1880fc1a39e47e7dcf3e5eb1ce Mon Sep 17 00:00:00 2001
From: Stefan Kopf <stefan.kopf@alfresco.com>
Date: Thu, 1 Jun 2017 12:38:50 +0000
Subject: [PATCH] Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)    136982
 anechifor: added profile

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ...coPdfRendererContentTransformerWorker.java | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/source/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
index 6c6458edf1..abb6e894a4 100644
--- a/source/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
+++ b/source/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
@@ -248,22 +248,24 @@ public class AlfrescoPdfRendererContentTransformerWorker extends ContentTransfor
             {
                 commandOptions = "";
             }
-
-            if (resizeOptions.getHeight() > -1)
+            if(resizeOptions != null)
             {
-                commandOptions += " --height=" + resizeOptions.getHeight();
-            }
-            if (resizeOptions.getWidth() > -1)
-            {
-                commandOptions += " --width=" + resizeOptions.getHeight();
-            }
-            if (resizeOptions.getAllowEnlargement())
-            {
-                commandOptions += " --allow-enlargement";
-            }
-            if (resizeOptions.isMaintainAspectRatio())
-            {
-                commandOptions += " --maintain-aspect-ratio";
+	            if (resizeOptions.getHeight() > -1)
+	            {
+	                commandOptions += " --height=" + resizeOptions.getHeight();
+	            }
+	            if (resizeOptions.getWidth() > -1)
+	            {
+	                commandOptions += " --width=" + resizeOptions.getHeight();
+	            }
+	            if (resizeOptions.getAllowEnlargement())
+	            {
+	                commandOptions += " --allow-enlargement";
+	            }
+	            if (resizeOptions.isMaintainAspectRatio())
+	            {
+	                commandOptions += " --maintain-aspect-ratio";
+	            }
             }
             commandOptions += " --page=" + getSourcePageRange(imageOptions, sourceMimetype, targetMimetype);