You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2012/10/21 09:42:32 UTC
svn commit: r1400586 - in /xmlgraphics/commons/branches/Temp_MergeFrom15: ./
src/java/org/apache/xmlgraphics/image/loader/spi/
src/java/org/apache/xmlgraphics/image/writer/internal/
src/java/org/apache/xmlgraphics/java2d/color/ src/java/org/apache/xmlg...
Author: gadams
Date: Sun Oct 21 07:42:32 2012
New Revision: 1400586
URL: http://svn.apache.org/viewvc?rev=1400586&view=rev
Log:
Merge from ^/branches/commons_1-5rc1:1345751.
Modified:
xmlgraphics/commons/branches/Temp_MergeFrom15/ (props changed)
xmlgraphics/commons/branches/Temp_MergeFrom15/build.xml
xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java
xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/DeviceCMYKColorSpace.java
xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/profile/NamedColorProfile.java
Propchange: xmlgraphics/commons/branches/Temp_MergeFrom15/
------------------------------------------------------------------------------
Merged /xmlgraphics/commons/branches/commons-1_5rc1:r1345751
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/build.xml?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/build.xml (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/build.xml Sun Oct 21 07:42:32 2012
@@ -400,7 +400,6 @@ NOTE:
<sourcepath>
<pathelement path="${src.java.dir}"/>
</sourcepath>
- <tag name="todo" scope="all" description="To do:"/>
<group title="Images">
<package name="org.apache.xmlgraphics.image"/>
<package name="org.apache.xmlgraphics.image.*"/>
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java Sun Oct 21 07:42:32 2012
@@ -40,8 +40,8 @@ public interface ImageConverter {
/**
* Converts an image into a different representation.
- * <p> The new image returned shall preserve the original {@link ImageInfo} instance.
- * Consumers can get the effective MIME type (if any) from the associated {@link ImageFlavor}.
+ * <p>Consumers can get the effective MIME type (if any) from the
+ * associated {@link ImageFlavor}.
* @param src the source image
* @param hints the conversion hints
* @return the converted image
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java Sun Oct 21 07:42:32 2012
@@ -35,26 +35,20 @@ import org.apache.xmlgraphics.image.writ
*/
public class PNGImageWriter extends AbstractImageWriter {
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
- */
+ /** {@inheritDoc} */
public void writeImage(RenderedImage image, OutputStream out)
throws IOException {
writeImage(image, out, null);
}
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
- */
+ /** {@inheritDoc} */
public void writeImage(RenderedImage image, OutputStream out,
ImageWriterParams params) throws IOException {
PNGImageEncoder encoder = new PNGImageEncoder(out, null);
encoder.encode(image);
}
- /**
- * @see ImageWriter#getMIMEType()
- */
+ /** {@inheritDoc} */
public String getMIMEType() {
return "image/png";
}
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java Sun Oct 21 07:42:32 2012
@@ -20,8 +20,8 @@
package org.apache.xmlgraphics.java2d.color;
/**
- * Interface used to decorate {@link ColorSpace} subclasses to report the origin of the
- * associated color profile.
+ * Interface used to decorate {@link java.awt.color.ColorSpaces} subclasses
+ * to report the origin of the associated color profile.
*/
public interface ColorSpaceOrigin {
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/DeviceCMYKColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/DeviceCMYKColorSpace.java?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/DeviceCMYKColorSpace.java (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/DeviceCMYKColorSpace.java Sun Oct 21 07:42:32 2012
@@ -33,8 +33,8 @@ public class DeviceCMYKColorSpace extend
public static final String PSEUDO_PROFILE_NAME = "#CMYK";
/**
- * Constructs an uncalibrated CMYK ColorSpace object with {@link ColorSpace#TYPE_CMYK} and
- * 4 components.
+ * Constructs an uncalibrated CMYK ColorSpace object with
+ * {@link java.awt.color.ColorSpace#TYPE_CMYK} and 4 components.
* @see java.awt.color.ColorSpace#ColorSpace(int, int)
*/
public DeviceCMYKColorSpace() {
Modified: xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/profile/NamedColorProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/profile/NamedColorProfile.java?rev=1400586&r1=1400585&r2=1400586&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/profile/NamedColorProfile.java (original)
+++ xmlgraphics/commons/branches/Temp_MergeFrom15/src/java/org/apache/xmlgraphics/java2d/color/profile/NamedColorProfile.java Sun Oct 21 07:42:32 2012
@@ -49,7 +49,8 @@ public class NamedColorProfile {
/**
* Returns the color profile's rendering intent.
- * @return the rendering intent (See {@link ICC_Profile}.ic*)
+ * @return the rendering intent
+ * (See {@link java.awt.color.ICC_Profile}.ic*)
*/
public RenderingIntent getRenderingIntent() {
return this.renderingIntent;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org