Merging upstream version 4:24.2.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 3ad139b65f..2517618e10 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -956,18 +956,18 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
 
     double csdx = 0.0;
     double csdy = 0.0;
-    if (state->getFont()->getWMode())
+    if (!state->getFont() || !state->getFont()->getWMode())
     {
-        csdy = state->getCharSpace();
+        csdx = state->getCharSpace();
         if (*u == ' ')
-            csdy += state->getWordSpace();
+            csdx += state->getWordSpace();
+        csdx *= state->getHorizScaling();
     }
     else
     {
-        csdx = state->getCharSpace();
+        csdy = state->getCharSpace();
         if (*u == ' ')
-            csdx += state->getWordSpace();
-        csdx *= state->getHorizScaling();
+            csdy += state->getWordSpace();
     }
 
     double cstdx = 0.0;