You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/01/10 20:09:28 UTC

svn commit: r1778185 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading: AxialShadingContext.java RadialShadingContext.java ShadingContext.java TriangleBasedShadingContext.java Type1ShadingContext.java

Author: tilman
Date: Tue Jan 10 20:09:28 2017
New Revision: 1778185

URL: http://svn.apache.org/viewvc?rev=1778185&view=rev
Log:
PDFBOX-3647: remove bbox handling

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1778185&r1=1778184&r2=1778185&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Tue Jan 10 20:09:28 2017
@@ -178,24 +178,12 @@ public class AxialShadingContext extends
         int[] data = new int[w * h * 4];
         for (int j = 0; j < h; j++)
         {
-            double currentY = y + j;
-            if (bboxRect != null && (currentY < minBBoxY || currentY > maxBBoxY))
-            {
-                continue;
-            }
             for (int i = 0; i < w; i++)
             {
-                double currentX = x + i;
-                if (bboxRect != null && (currentX < minBBoxX || currentX > maxBBoxX))
-                {
-                    continue;
-                }
                 useBackground = false;
                 float[] values = new float[] { x + i, y + j };
                 rat.transform(values, 0, values, 0, 1);
-                currentX = values[0];
-                currentY = values[1];
-                double inputValue = x1x0 * (currentX - coords[0]) + y1y0 * (currentY - coords[1]);
+                double inputValue = x1x0 * (values[0] - coords[0]) + y1y0 * (values[1] - coords[1]);
                 // TODO this happens if start == end, see PDFBOX-1442
                 if (denom == 0)
                 {

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1778185&r1=1778184&r2=1778185&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Tue Jan 10 20:09:28 2017
@@ -184,26 +184,12 @@ public class RadialShadingContext extend
         int[] data = new int[w * h * 4];
         for (int j = 0; j < h; j++)
         {
-            double currentY = y + j;
-            if (bboxRect != null && (currentY < minBBoxY || currentY > maxBBoxY))
-            {
-                continue;
-            }
             for (int i = 0; i < w; i++)
             {
-                double currentX = x + i;
-                if (bboxRect != null && (currentX < minBBoxX || currentX > maxBBoxX))
-                {
-                    continue;
-                }
-
                 float[] values = new float[] { x + i, y + j };
                 rat.transform(values, 0, values, 0, 1);
-                currentX = values[0];
-                currentY = values[1];
-
                 useBackground = false;
-                float[] inputValues = calculateInputValues(currentX, currentY);
+                float[] inputValues = calculateInputValues(values[0], values[1]);
                 if (Float.isNaN(inputValues[0]) && Float.isNaN(inputValues[1]))
                 {
                     if (getBackground() == null)

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java?rev=1778185&r1=1778184&r2=1778185&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java Tue Jan 10 20:09:28 2017
@@ -39,9 +39,6 @@ public abstract class ShadingContext
 {
     private static final Log LOG = LogFactory.getLog(ShadingContext.class);
 
-    protected PDRectangle bboxRect;
-    protected float minBBoxX, minBBoxY, maxBBoxX, maxBBoxY;
-
     private float[] background;
     private int rgbBackground;
     private final PDShading shading;
@@ -69,14 +66,6 @@ public abstract class ShadingContext
         outputColorModel = new ComponentColorModel(outputCS, true, false, Transparency.TRANSLUCENT,
                 DataBuffer.TYPE_BYTE);
 
-        bboxRect = shading.getBBox();
-        // all bbox handling will be removed in further commit
-        bboxRect = null;
-        if (bboxRect != null)
-        {
-            transformBBox(matrix, xform);
-        }
-        
         // get background values if available
         COSArray bg = shading.getBackground();
         if (bg != null)
@@ -105,29 +94,6 @@ public abstract class ShadingContext
     {
         return rgbBackground;
     }
-    
-    private void transformBBox(Matrix matrix, AffineTransform xform)
-    {
-        float[] bboxTab = new float[4];
-        bboxTab[0] = bboxRect.getLowerLeftX();
-        bboxTab[1] = bboxRect.getLowerLeftY();
-        bboxTab[2] = bboxRect.getUpperRightX();
-        bboxTab[3] = bboxRect.getUpperRightY();
-
-        // transform the coords using the given matrix
-        matrix.createAffineTransform().transform(bboxTab, 0, bboxTab, 0, 2);
-
-        xform.transform(bboxTab, 0, bboxTab, 0, 2);
-        minBBoxX = Math.min(bboxTab[0], bboxTab[2]);
-        minBBoxY = Math.min(bboxTab[1], bboxTab[3]);
-        maxBBoxX = Math.max(bboxTab[0], bboxTab[2]);
-        maxBBoxY = Math.max(bboxTab[1], bboxTab[3]);
-        if (minBBoxX >= maxBBoxX || minBBoxY >= maxBBoxY)
-        {
-            LOG.warn("empty BBox is ignored");
-            bboxRect = null;
-        }
-    }
 
     /**
      * Convert color values from shading colorspace to RGB color values encoded

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java?rev=1778185&r1=1778184&r2=1778185&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java Tue Jan 10 20:09:28 2017
@@ -165,19 +165,9 @@ abstract class TriangleBasedShadingConte
         {
             for (int row = 0; row < h; row++)
             {
-                int currentY = y + row;
-                if (bboxRect != null && (currentY < minBBoxY || currentY > maxBBoxY))
-                {
-                    continue;
-                }
                 for (int col = 0; col < w; col++)
                 {
-                    int currentX = x + col;
-                    if (bboxRect != null && (currentX < minBBoxX || currentX > maxBBoxX))
-                    {
-                        continue;
-                    }
-                    Point p = new Point(currentX, currentY);
+                    Point p = new Point(x + col, y + row);
                     int value;
                     if (pixelTable.containsKey(p))
                     {

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1778185&r1=1778184&r2=1778185&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Tue Jan 10 20:09:28 2017
@@ -103,20 +103,8 @@ class Type1ShadingContext extends Shadin
         int[] data = new int[w * h * 4];
         for (int j = 0; j < h; j++)
         {
-            int currentY = y + j;
-            if (bboxRect != null && (currentY < minBBoxY || currentY > maxBBoxY))
-            {
-                continue;
-            }
-
             for (int i = 0; i < w; i++)
             {
-                int currentX = x + i;
-                if (bboxRect != null && (currentX < minBBoxX || currentX > maxBBoxX))
-                {
-                    continue;
-                }
-
                 int index = (j * w + i) * 4;
                 boolean useBackground = false;
                 float[] values = new float[] { x + i, y + j };