Author: lbernardo
Date: Wed Dec 3 12:16:16 2014
New Revision: 1643102
URL: http://svn.apache.org/r1643102
Log:
minor tweaks: updated copyright date, pdf-transcoder task, and checkstyle fixes
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/Tile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/TileSize.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
Modified: xmlgraphics/fop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1643102&r1=1643101&r2=1643102&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Wed Dec 3 12:16:16 2014
@@ -150,7 +150,7 @@ list of possible build targets.
<property name="name" value="fop"/>
<property name="NAME" value="FOP"/>
<property name="version" value="svn-trunk"/>
- <property name="year" value="1999-2012"/>
+ <property name="year" value="1999-2014"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
<property name="javac.deprecation" value="on"/>
@@ -624,7 +624,7 @@ list of possible build targets.
<target name="transcoder-pkg" depends="remove-cache,
uptodate-transcoder-pkg, compile" description="Generates the jar for the
transcoder package for Batik" unless="transcoder.pkg.uptodate">
<echo message="Creating the jar file ${build.dir}/fop-transcoder.jar"/>
<property name="fop-transcoder.name" value="FOP Transcoder Package"/>
- <property name="fop-transcoder.version" value="1.0beta2"/>
+ <property name="fop-transcoder.version" value="${version}"/>
<tstamp>
<format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
</tstamp>
@@ -652,12 +652,6 @@ list of possible build targets.
<include name="org/apache/commons/io/*.class"/>
<include name="org/apache/commons/io/filefilter/*.class"/>
<include name="org/apache/commons/io/output/*.class"/>
-<!-- TODO Remove the following lines once Batik switches over to using XML
Graphics Commons -->
- <include name="org/apache/xmlgraphics/java2d/**"/>
- <include name="org/apache/xmlgraphics/ps/**"/>
- <include name="org/apache/xmlgraphics/fonts/**"/>
- <include name="org/apache/xmlgraphics/util/**"/>
- <include name="org/apache/xmlgraphics/image/loader/**"/>
</patternset>
<fileset refid="transcoder-lib-files"/>
</unjar>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/Tile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/Tile.java?rev=1643102&r1=1643101&r2=1643102&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/Tile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/Tile.java Wed Dec 3
12:16:16 2014
@@ -28,8 +28,8 @@ import org.apache.fop.afp.util.BinaryUti
public class Tile extends AbstractStructuredObject {
private static final int MAX_DATA_LEN = 8191;
- private TilePosition tilePosition = null;
- private TileSize tileSize = null;
+ private TilePosition tilePosition;
+ private TileSize tileSize;
private BandImage bandImage;
private byte[] data;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/TileSize.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/TileSize.java?rev=1643102&r1=1643101&r2=1643102&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/TileSize.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/TileSize.java Wed
Dec 3 12:16:16 2014
@@ -27,10 +27,10 @@ import org.apache.fop.afp.util.BinaryUti
public class TileSize extends AbstractAFPObject {
- private int hSize = 0;
- private int vSize = 0;
-// private int hRes = 0; // hRes and vRes not used yet -probably need them
in the future
-// private int vRes = 0;
+ private int hSize;
+ private int vSize;
+// private int hRes; // hRes and vRes not used yet -probably need them in
the future
+// private int vRes;
public TileSize(int hsize, int vsize, int hresol, int vresol) {
this.hSize = hsize;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java?rev=1643102&r1=1643101&r2=1643102&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
Wed Dec 3 12:16:16 2014
@@ -80,9 +80,9 @@ public class ImageObject extends Abstrac
= factory.createImageDataDescriptor(dataWidth, dataHeight,
dataWidthRes, dataHeightRes);
boolean setImageSize = true;
- if
(MimeConstants.MIME_AFP_IOCA_FS45.equals(imageObjectInfo.getMimeType()) ) {
+ if
(MimeConstants.MIME_AFP_IOCA_FS45.equals(imageObjectInfo.getMimeType())) {
imageDataDescriptor.setFunctionSet(ImageDataDescriptor.FUNCTION_SET_FS45);
- if (imageObjectInfo.getBitsPerPixel() == 32 ) {
+ if (imageObjectInfo.getBitsPerPixel() == 32) {
setImageSize = false;
Tile tile = factory.createTile();
TilePosition tilePosition = factory.createTilePosition();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
