You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ac...@apache.org on 2008/07/10 12:23:55 UTC
svn commit: r675501 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Author: acumiskey
Date: Thu Jul 10 03:23:54 2008
New Revision: 675501
URL: http://svn.apache.org/viewvc?rev=675501&view=rev
Log:
Duplicated operation scaleX and scaleY replaced simply with scale.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=675501&r1=675500&r2=675501&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Thu Jul 10 03:23:54 2008
@@ -189,12 +189,12 @@
* @param newScaleFactor ]0 ; 1]
*/
public void setScaleFactor(double newScaleFactor) {
- scaleFactor = newScaleFactor;
+ this.scaleFactor = newScaleFactor;
}
/** @return the scale factor */
public double getScaleFactor() {
- return scaleFactor;
+ return this.scaleFactor;
}
/** {@inheritDoc} */
@@ -292,22 +292,19 @@
this.currentPageViewport = pageViewport;
try {
Rectangle2D bounds = pageViewport.getViewArea();
- pageWidth = (int) Math.round(bounds.getWidth() / 1000f);
- pageHeight = (int) Math.round(bounds.getHeight() / 1000f);
+ this.pageWidth = (int) Math.round(bounds.getWidth() / 1000f);
+ this.pageHeight = (int) Math.round(bounds.getHeight() / 1000f);
log.info(
"Rendering Page " + pageViewport.getPageNumberString()
+ " (pageWidth " + pageWidth + ", pageHeight "
+ pageHeight + ")");
- double scaleX = scaleFactor
- * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
+ double scale = scaleFactor
+ * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
/ userAgent.getTargetPixelUnitToMillimeter();
- double scaleY = scaleFactor
- * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION)
- / userAgent.getTargetPixelUnitToMillimeter();
- int bitmapWidth = (int) ((pageWidth * scaleX) + 0.5);
- int bitmapHeight = (int) ((pageHeight * scaleY) + 0.5);
+ int bitmapWidth = (int) ((pageWidth * scale) + 0.5);
+ int bitmapHeight = (int) ((pageHeight * scale) + 0.5);
BufferedImage currentPageImage = getBufferedImage(bitmapWidth, bitmapHeight);
@@ -330,7 +327,7 @@
// transform page based on scale factor supplied
AffineTransform at = graphics.getTransform();
- at.scale(scaleX, scaleY);
+ at.scale(scale, scale);
graphics.setTransform(at);
// draw page frame
@@ -466,11 +463,11 @@
protected void restoreStateStackAfterBreakOut(List breakOutList) {
log.debug("Block.FIXED --> restoring context after break-out");
- Iterator i = breakOutList.iterator();
- while (i.hasNext()) {
- Java2DGraphicsState s = (Java2DGraphicsState)i.next();
+ Iterator it = breakOutList.iterator();
+ while (it.hasNext()) {
+ Java2DGraphicsState s = (Java2DGraphicsState)it.next();
stateStack.push(state);
- state = s;
+ this.state = s;
}
}
@@ -1015,5 +1012,4 @@
public void setTransparentPageBackground(boolean transparentPageBackground) {
this.transparentPageBackground = transparentPageBackground;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org