pdf import. improve upon rev 11094. transform four corners of bbox separately (Bug 919176)

Fixed bugs:
  - https://launchpad.net/bugs/919176

(bzr r11112)

1 files changed, 14 insertions, 8 deletions

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 3b19f925e..5347a85ac 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -1672,17 +1672,23 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/)
     if (matrix != NULL) {
         xTemp = matrix[0]*xMin + matrix[2]*yMin + matrix[4];
         yTemp = matrix[1]*xMin + matrix[3]*yMin + matrix[5];
-        xMin = xTemp;
-        yMin = yTemp;
+        state->moveTo(xTemp, yTemp);
+        xTemp = matrix[0]*xMax + matrix[2]*yMin + matrix[4];
+        yTemp = matrix[1]*xMax + matrix[3]*yMin + matrix[5];
+        state->lineTo(xTemp, yTemp);
         xTemp = matrix[0]*xMax + matrix[2]*yMax + matrix[4];
         yTemp = matrix[1]*xMax + matrix[3]*yMax + matrix[5];
-        xMax = xTemp;
-        yMax = yTemp;
+        state->lineTo(xTemp, yTemp);
+        xTemp = matrix[0]*xMin + matrix[2]*yMax + matrix[4];
+        yTemp = matrix[1]*xMin + matrix[3]*yMax + matrix[5];
+        state->lineTo(xTemp, yTemp);
+    }
+    else {
+        state->moveTo(xMin, yMin);
+        state->lineTo(xMax, yMin);
+        state->lineTo(xMax, yMax);
+        state->lineTo(xMin, yMax);
     }
-    state->moveTo(xMin, yMin);
-    state->lineTo(xMax, yMin);
-    state->lineTo(xMax, yMax);
-    state->lineTo(xMin, yMax);
     state->closePath();
     state->clip();
     if (savedState)