Author: tilman
Date: Sat Jul 11 19:51:39 2026
New Revision: 1936058
Log:
PDFBOX-5660: remove unused parameters as suggested by Valery Bokov; closes #477
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -60,16 +60,15 @@ public class AxialShadingContext extends
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @param deviceBounds the bounds of the area to paint, in device units
* @throws IOException if there is an error getting the color space or
doing color conversion.
*/
- public AxialShadingContext(PDShadingType2 shading, ColorModel colorModel,
AffineTransform xform,
+ public AxialShadingContext(PDShadingType2 shading, AffineTransform xform,
Matrix matrix, Rectangle deviceBounds) throws
IOException
{
- super(shading, colorModel, xform, matrix);
+ super(shading);
this.axialShadingType = shading;
coords = shading.getCoords().toFloatArray();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -59,7 +59,7 @@ public class AxialShadingPaint extends S
{
try
{
- return new AxialShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new AxialShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -43,15 +43,11 @@ abstract class GouraudShadingContext ext
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
- * @param xform transformation for user to device space
- * @param matrix the pattern matrix concatenated with that of the parent
content stream
* @throws IOException if something went wrong
*/
- protected GouraudShadingContext(PDShading shading, ColorModel colorModel,
AffineTransform xform,
- Matrix matrix) throws IOException
+ protected GouraudShadingContext(PDShading shading) throws IOException
{
- super(shading, colorModel, xform, matrix);
+ super(shading);
}
final void setTriangleList(List<ShadedTriangle> triangleList)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -41,18 +41,17 @@ abstract class PatchMeshesShadingContext
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @param deviceBounds device bounds
* @param controlPoints number of control points, 12 for type 6 shading
and 16 for type 7 shading
* @throws IOException if something went wrong
*/
- protected PatchMeshesShadingContext(PDMeshBasedShadingType shading,
ColorModel colorModel,
+ protected PatchMeshesShadingContext(PDMeshBasedShadingType shading,
AffineTransform xform, Matrix matrix, Rectangle deviceBounds,
int controlPoints) throws IOException
{
- super(shading, colorModel, xform, matrix);
+ super(shading);
patchList = shading.collectPatches(xform, matrix, controlPoints);
createPixelTable(deviceBounds);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -62,17 +62,16 @@ public class RadialShadingContext extend
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @param deviceBounds the bounds of the area to paint, in device units
* @throws IOException if there is an error getting the color space or
doing color conversion.
*/
- public RadialShadingContext(PDShadingType3 shading, ColorModel colorModel,
+ public RadialShadingContext(PDShadingType3 shading,
AffineTransform xform, Matrix matrix,
Rectangle deviceBounds)
throws IOException
{
- super(shading, colorModel, xform, matrix);
+ super(shading);
this.radialShadingType = shading;
coords = shading.getCoords().toFloatArray();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -60,7 +60,7 @@ public class RadialShadingPaint extends
{
try
{
- return new RadialShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new RadialShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -18,14 +18,12 @@ package org.apache.pdfbox.pdmodel.graphi
import java.awt.PaintContext;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
-import java.awt.geom.AffineTransform;
import java.awt.image.ColorModel;
import java.awt.image.ComponentColorModel;
import java.awt.image.DataBuffer;
import java.io.IOException;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
-import org.apache.pdfbox.util.Matrix;
/**
* A base class to handle what is common to all shading types.
@@ -45,14 +43,10 @@ public abstract class ShadingContext imp
* Constructor.
*
* @param shading the shading type to be used
- * @param cm the color model to be used
- * @param xform transformation for user to device space
- * @param matrix the pattern matrix concatenated with that of the parent
content stream
* @throws java.io.IOException if there is an error getting the color space
* or doing background color conversion.
*/
- protected ShadingContext(PDShading shading, ColorModel cm, AffineTransform
xform,
- Matrix matrix) throws IOException
+ protected ShadingContext(PDShading shading) throws IOException
{
this.shading = shading;
shadingColorSpace = shading.getColorSpace();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -46,15 +46,11 @@ abstract class TriangleBasedShadingConte
* Constructor.
*
* @param shading the shading type to be used
- * @param cm the color model to be used
- * @param xform transformation for user to device space
- * @param matrix the pattern matrix concatenated with that of the parent
content stream
* @throws IOException if there is an error getting the color space or
doing background color conversion.
*/
- TriangleBasedShadingContext(PDShading shading, ColorModel cm,
AffineTransform xform,
- Matrix matrix) throws IOException
+ TriangleBasedShadingContext(PDShading shading) throws IOException
{
- super(shading, cm, xform, matrix);
+ super(shading);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -43,14 +43,13 @@ class Type1ShadingContext extends Shadin
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
*/
- Type1ShadingContext(PDShadingType1 shading, ColorModel colorModel,
AffineTransform xform,
+ Type1ShadingContext(PDShadingType1 shading, AffineTransform xform,
Matrix matrix) throws IOException
{
- super(shading, colorModel, xform, matrix);
+ super(shading);
this.type1ShadingType = shading;
// (Optional) An array of four numbers [ xmin xmax ymin ymax ]
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -58,7 +58,7 @@ class Type1ShadingPaint extends ShadingP
{
try
{
- return new Type1ShadingContext(shading, cm, xform, matrix);
+ return new Type1ShadingContext(shading, xform, matrix);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -18,7 +18,6 @@ package org.apache.pdfbox.pdmodel.graphi
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
-import java.awt.image.ColorModel;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
@@ -40,14 +39,13 @@ class Type4ShadingContext extends Gourau
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param cm the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
*/
- Type4ShadingContext(PDShadingType4 shading, ColorModel cm, AffineTransform
xform,
+ Type4ShadingContext(PDShadingType4 shading, AffineTransform xform,
Matrix matrix, Rectangle deviceBounds) throws
IOException
{
- super(shading, cm, xform, matrix);
+ super(shading);
LOG.debug("Type4ShadingContext");
bitsPerFlag = shading.getBitsPerFlag();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -58,7 +58,7 @@ class Type4ShadingPaint extends ShadingP
{
try
{
- return new Type4ShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new Type4ShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -39,15 +39,14 @@ class Type5ShadingContext extends Gourau
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param cm the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @throws IOException if something went wrong
*/
- Type5ShadingContext(PDShadingType5 shading, ColorModel cm, AffineTransform
xform,
+ Type5ShadingContext(PDShadingType5 shading, AffineTransform xform,
Matrix matrix, Rectangle deviceBounds) throws
IOException
{
- super(shading, cm, xform, matrix);
+ super(shading);
LOG.debug("Type5ShadingContext");
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -58,7 +58,7 @@ class Type5ShadingPaint extends ShadingP
{
try
{
- return new Type5ShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new Type5ShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -33,15 +33,14 @@ class Type6ShadingContext extends PatchM
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @param deviceBounds device bounds
* @throws IOException if something went wrong
*/
- Type6ShadingContext(PDShadingType6 shading, ColorModel colorModel,
AffineTransform xform,
+ Type6ShadingContext(PDShadingType6 shading, AffineTransform xform,
Matrix matrix, Rectangle deviceBounds) throws
IOException
{
- super(shading, colorModel, xform, matrix, deviceBounds, 12);
+ super(shading, xform, matrix, deviceBounds, 12);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -60,7 +60,7 @@ class Type6ShadingPaint extends ShadingP
{
try
{
- return new Type6ShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new Type6ShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -33,15 +33,14 @@ class Type7ShadingContext extends PatchM
* Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
- * @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param matrix the pattern matrix concatenated with that of the parent
content stream
* @param deviceBounds device bounds
* @throws IOException if something went wrong
*/
- Type7ShadingContext(PDShadingType7 shading, ColorModel colorModel,
AffineTransform xform,
+ Type7ShadingContext(PDShadingType7 shading, AffineTransform xform,
Matrix matrix, Rectangle deviceBounds) throws
IOException
{
- super(shading, colorModel, xform, matrix, deviceBounds, 16);
+ super(shading, xform, matrix, deviceBounds, 16);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
Sat Jul 11 18:45:04 2026 (r1936057)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
Sat Jul 11 19:51:39 2026 (r1936058)
@@ -60,7 +60,7 @@ class Type7ShadingPaint extends ShadingP
{
try
{
- return new Type7ShadingContext(shading, cm, xform, matrix,
deviceBounds);
+ return new Type7ShadingContext(shading, xform, matrix,
deviceBounds);
}
catch (IOException e)
{
