/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.pdfbox.util.operator.pagedrawer;

import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.util.List;

import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.rendering.PageDrawer;
import org.apache.pdfbox.util.operator.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;

/**
 * re Appends a rectangle to the path.
 * @author Ben Litchfield
 */
public final class AppendRectangleToPath extends OperatorProcessor
{
    @Override
    public void process(PDFOperator operator, List<COSBase> operands)
    {
        PageDrawer drawer = (PageDrawer)context;

        COSNumber x = (COSNumber)operands.get(0);
        COSNumber y = (COSNumber)operands.get(1);
        COSNumber w = (COSNumber)operands.get(2);
        COSNumber h = (COSNumber)operands.get(3);

        double x1 = x.doubleValue();
        double y1 = y.doubleValue();

        // create a pair of coordinates for the transformation
        double x2 = w.doubleValue() + x1;
        double y2 = h.doubleValue() + y1;

        Point2D startCoords = drawer.transformedPoint(x1, y1);
        Point2D endCoords = drawer.transformedPoint(x2, y2);

        float width = (float)(endCoords.getX() - startCoords.getX());
        float height = (float)(endCoords.getY() - startCoords.getY());
        float xStart = (float)startCoords.getX();
        float yStart = (float)startCoords.getY();

        // to ensure that the path is created in the right direction, we have to create
        // it by combining single lines instead of creating a simple rectangle
        GeneralPath path = drawer.getLinePath();
        path.moveTo(xStart, yStart);
        path.lineTo(xStart + width, yStart);
        path.lineTo(xStart + width, yStart + height);
        path.lineTo(xStart, yStart + height);

        // close the subpath instead of adding the last line so that a possible set line
        // cap style isn't taken into account at the "beginning" of the rectangle
        path.closePath();
    }
}

@@ -1216,16 +1216,19 @@
 e path.%0A
+ *%0A
  * @auth
@@ -1448,16 +1448,17 @@
 eDrawer)
+ 
 context;
@@ -1484,32 +1484,33 @@
  x = (COSNumber)
+ 
 operands.get(0);
@@ -1535,32 +1535,33 @@
  y = (COSNumber)
+ 
 operands.get(1);
@@ -1586,32 +1586,33 @@
  w = (COSNumber)
+ 
 operands.get(2);
@@ -1645,16 +1645,17 @@
 SNumber)
+ 
 operands
@@ -1903,27 +1903,18 @@
 Point2D 
-startCoords
+p0
  = drawe
@@ -1957,25 +1957,18 @@
 Point2D 
-endCoords
+p1
  = drawe
@@ -1995,21 +1995,20 @@
 2, y
-2
+1
 );%0A
-%0A
         
 floa
@@ -2007,238 +2007,105 @@
     
-float width = (float)(endCoords.getX() - startCoords.getX());%0A        float height = (float)(endCoords.getY() - startCoords.getY());%0A        float xStart = (float)startCoords.getX();%0A        float yStart = (float)startCoords.getY(
+Point2D p2 = drawer.transformedPoint(x2, y2);%0A        Point2D p3 = drawer.transformedPoint(x1, y2
 );%0A%0A
@@ -2344,167 +2344,221 @@
 eTo(
-xStart, yStart);%0A        path.lineTo(xStart + width, yStart);%0A        path.lineTo(xStart + width, yStart + height);%0A        path.lineTo(xStart, yStart + height
+(float) p0.getX(), (float) p0.getY());%0A        path.lineTo((float) p1.getX(), (float) p1.getY());%0A        path.lineTo((float) p2.getX(), (float) p2.getY());%0A        path.lineTo((float) p3.getX(), (float) p3.getY()
 );%0A%0A

correct application of rotation and skew to rectangles, as suggested by Petr Slaby