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 2021/05/08 08:40:51 UTC
svn commit: r1889664 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading:
AxialShadingContext.java RadialShadingContext.java ShadingContext.java
TriangleBasedShadingContext.java Type1ShadingContext.java
Author: tilman
Date: Sat May 8 08:40:51 2021
New Revision: 1889664
URL: http://svn.apache.org/viewvc?rev=1889664&view=rev
Log:
PDFBOX-5189: refactor so that ShadingContext class so that it implements PaintContext; remove double code
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/RadialShadingContext.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
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1889664&r1=1889663&r2=1889664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Sat May 8 08:40:51 2021
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
-import java.awt.PaintContext;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
@@ -38,7 +37,7 @@ import org.apache.pdfbox.util.Matrix;
*
* @author Shaola Ren
*/
-public class AxialShadingContext extends ShadingContext implements PaintContext
+public class AxialShadingContext extends ShadingContext
{
private static final Log LOG = LogFactory.getLog(AxialShadingContext.class);
@@ -164,12 +163,6 @@ public class AxialShadingContext extends
}
@Override
- public ColorModel getColorModel()
- {
- return super.getColorModel();
- }
-
- @Override
public Raster getRaster(int x, int y, int w, int h)
{
// create writable raster
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1889664&r1=1889663&r2=1889664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Sat May 8 08:40:51 2021
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
-import java.awt.PaintContext;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
@@ -38,7 +37,7 @@ import org.apache.pdfbox.util.Matrix;
*
* @author Shaola Ren
*/
-public class RadialShadingContext extends ShadingContext implements PaintContext
+public class RadialShadingContext extends ShadingContext
{
private static final Log LOG = LogFactory.getLog(RadialShadingContext.class);
@@ -169,12 +168,6 @@ public class RadialShadingContext extend
}
@Override
- public ColorModel getColorModel()
- {
- return super.getColorModel();
- }
-
- @Override
public Raster getRaster(int x, int y, int w, int h)
{
// create writable raster
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java?rev=1889664&r1=1889663&r2=1889664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java Sat May 8 08:40:51 2021
@@ -15,6 +15,7 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
+import java.awt.PaintContext;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
import java.awt.geom.AffineTransform;
@@ -32,7 +33,7 @@ import org.apache.pdfbox.util.Matrix;
* @author Shaola Ren
* @author Tilman Hausherr
*/
-public abstract class ShadingContext
+public abstract class ShadingContext implements PaintContext
{
private float[] background;
private int rgbBackground;
@@ -110,15 +111,16 @@ public abstract class ShadingContext
return normRGBValues;
}
- ColorModel getColorModel()
+ @Override
+ public ColorModel getColorModel()
{
return outputColorModel;
}
- void dispose()
+ @Override
+ public void dispose()
{
outputColorModel = null;
shadingColorSpace = null;
}
-
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java?rev=1889664&r1=1889663&r2=1889664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java Sat May 8 08:40:51 2021
@@ -15,7 +15,6 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
-import java.awt.PaintContext;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
@@ -35,7 +34,7 @@ import org.apache.pdfbox.util.Matrix;
* @author Shaola Ren
* @author Tilman Hausherr
*/
-abstract class TriangleBasedShadingContext extends ShadingContext implements PaintContext
+abstract class TriangleBasedShadingContext extends ShadingContext
{
// map of pixels within triangles to their RGB color
private Map<Point, Integer> pixelTable;
@@ -153,18 +152,6 @@ abstract class TriangleBasedShadingConte
abstract boolean isDataEmpty();
@Override
- public final ColorModel getColorModel()
- {
- return super.getColorModel();
- }
-
- @Override
- public void dispose()
- {
- super.dispose();
- }
-
- @Override
public final Raster getRaster(int x, int y, int w, int h)
{
WritableRaster raster = getColorModel().createCompatibleWritableRaster(w, h);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1889664&r1=1889663&r2=1889664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Sat May 8 08:40:51 2021
@@ -15,7 +15,6 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
-import java.awt.PaintContext;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
import java.awt.image.ColorModel;
@@ -32,7 +31,7 @@ import org.apache.pdfbox.util.Matrix;
*
* @author Tilman Hausherr
*/
-class Type1ShadingContext extends ShadingContext implements PaintContext
+class Type1ShadingContext extends ShadingContext
{
private static final Log LOG = LogFactory.getLog(Type1ShadingContext.class);
@@ -86,17 +85,10 @@ class Type1ShadingContext extends Shadin
public void dispose()
{
super.dispose();
-
type1ShadingType = null;
}
@Override
- public ColorModel getColorModel()
- {
- return super.getColorModel();
- }
-
- @Override
public Raster getRaster(int x, int y, int w, int h)
{
WritableRaster raster = getColorModel().createCompatibleWritableRaster(w, h);