Fridrich Strba 2022-03-20 07:46:54 +00:00 committed by Git OBS Bridge
parent 06559bd805
commit d7506bb53c
3 changed files with 0 additions and 383 deletions

View File

@ -1,374 +0,0 @@
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java 2022-03-19 05:57:50.370576678 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java 2022-03-19 06:21:55.026639865 +0100
@@ -100,33 +100,34 @@
* unsigned datatype, long is used. The mapping between types is
* as follows:
*
- * <table border=1 summary="TIFF">
+ * <table border=1>
+ * <caption>TIFF</caption>
* <tr>
* <th> TIFF type </th> <th> Java type </th>
* <tr>
- * <td><tt>TIFF_BYTE</tt></td> <td><tt>byte</tt></td>
+ * <td><code>TIFF_BYTE</code></td> <td><code>byte</code></td>
* <tr>
- * <td><tt>TIFF_ASCII</tt></td> <td><tt>String</tt></td>
+ * <td><code>TIFF_ASCII</code></td> <td><code>String</code></td>
* <tr>
- * <td><tt>TIFF_SHORT</tt></td> <td><tt>char</tt></td>
+ * <td><code>TIFF_SHORT</code></td> <td><code>char</code></td>
* <tr>
- * <td><tt>TIFF_LONG</tt></td> <td><tt>long</tt></td>
+ * <td><code>TIFF_LONG</code></td> <td><code>long</code></td>
* <tr>
- * <td><tt>TIFF_RATIONAL</tt></td> <td><tt>long[2]</tt></td>
+ * <td><code>TIFF_RATIONAL</code></td> <td><code>long[2]</code></td>
* <tr>
- * <td><tt>TIFF_SBYTE</tt></td> <td><tt>byte</tt></td>
+ * <td><code>TIFF_SBYTE</code></td> <td><code>byte</code></td>
* <tr>
- * <td><tt>TIFF_UNDEFINED</tt></td> <td><tt>byte</tt></td>
+ * <td><code>TIFF_UNDEFINED</code></td> <td><code>byte</code></td>
* <tr>
- * <td><tt>TIFF_SSHORT</tt></td> <td><tt>short</tt></td>
+ * <td><code>TIFF_SSHORT</code></td> <td><code>short</code></td>
* <tr>
- * <td><tt>TIFF_SLONG</tt></td> <td><tt>int</tt></td>
+ * <td><code>TIFF_SLONG</code></td> <td><code>int</code></td>
* <tr>
- * <td><tt>TIFF_SRATIONAL</tt></td> <td><tt>int[2]</tt></td>
+ * <td><code>TIFF_SRATIONAL</code></td> <td><code>int[2]</code></td>
* <tr>
- * <td><tt>TIFF_FLOAT</tt></td> <td><tt>float</tt></td>
+ * <td><code>TIFF_FLOAT</code></td> <td><code>float</code></td>
* <tr>
- * <td><tt>TIFF_DOUBLE</tt></td> <td><tt>double</tt></td>
+ * <td><code>TIFF_DOUBLE</code></td> <td><code>double</code></td>
* </table>
*/
public TIFFField(int tag, int type, int count, Object data) {
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/GraphicsUtil.java 2022-03-19 05:57:50.370576678 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/GraphicsUtil.java 2022-03-19 06:09:38.130258686 +0100
@@ -132,7 +132,7 @@
* @param premult True if the ColorModel should have premultiplied alpha.
* @return a ColorMdoel with Linear sRGB colorSpace and
* the alpha channel set in accordance with
- * <tt>premult</tt>
+ * <code>premult</code>
*/
public static ColorModel makeLinear_sRGBCM(boolean premult) {
return premult ? Linear_sRGB_Pre : Linear_sRGB_Unpre;
@@ -155,13 +155,13 @@
/**
* This method will return a CacheableRed that has it's data in
- * the linear sRGB colorspace. If <tt>src</tt> is already in
- * linear sRGB then this method does nothing and returns <tt>src</tt>.
+ * the linear sRGB colorspace. If <code>src</code> is already in
+ * linear sRGB then this method does nothing and returns <code>src</code>.
* Otherwise it creates a transform that will convert
- * <tt>src</tt>'s output to linear sRGB and returns that CacheableRed.
+ * <code>src</code>'s output to linear sRGB and returns that CacheableRed.
*
* @param src The image to convert to linear sRGB.
- * @return An equivilant image to <tt>src</tt> who's data is in
+ * @return An equivilant image to <code>src</code> who's data is in
* linear sRGB.
*/
public static CachableRed convertToLsRGB(CachableRed src) {
@@ -176,13 +176,13 @@
/**
* This method will return a CacheableRed that has it's data in
- * the sRGB colorspace. If <tt>src</tt> is already in
- * sRGB then this method does nothing and returns <tt>src</tt>.
+ * the sRGB colorspace. If <code>src</code> is already in
+ * sRGB then this method does nothing and returns <code>src</code>.
* Otherwise it creates a transform that will convert
- * <tt>src</tt>'s output to sRGB and returns that CacheableRed.
+ * <code>src</code>'s output to sRGB and returns that CacheableRed.
*
* @param src The image to convert to sRGB.
- * @return An equivilant image to <tt>src</tt> who's data is in sRGB.
+ * @return An equivilant image to <code>src</code> who's data is in sRGB.
*/
public static CachableRed convertTosRGB(CachableRed src) {
ColorModel cm = src.getColorModel();
@@ -196,11 +196,11 @@
/**
* Convertes any RenderedImage to a CacheableRed. <p>
- * If <tt>ri</tt> is already a CacheableRed it casts it down and
+ * If <code>ri</code> is already a CacheableRed it casts it down and
* returns it.<p>
*
- * In cases where <tt>ri</tt> is not already a CacheableRed it
- * wraps <tt>ri</tt> with a helper class. The wrapped
+ * In cases where <code>ri</code> is not already a CacheableRed it
+ * wraps <code>ri</code> with a helper class. The wrapped
* CacheableRed "Pretends" that it has no sources since it has no
* way of inteligently handling the dependency/dirty region calls
* if it exposed the source.
@@ -335,8 +335,8 @@
/**
* Copies data from one raster to another. Only the region of
- * overlap between src and dst is copied. <tt>Src</tt> and
- * <tt>Dst</tt> must have compatible SampleModels.
+ * overlap between src and dst is copied. <code>Src</code> and
+ * <code>Dst</code> must have compatible SampleModels.
*
* @param src The source of the data
* @param dst The destination for the data.
@@ -353,14 +353,14 @@
/**
* Creates a new raster that has a <b>copy</b> of the data in
- * <tt>ras</tt>. This is highly optimized for speed. There is
+ * <code>ras</code>. This is highly optimized for speed. There is
* no provision for changing any aspect of the SampleModel.
*
* This method should be used when you need to change the contents
* of a Raster that you do not "own" (ie the result of a
- * <tt>getData</tt> call).
+ * <code>getData</code> call).
* @param ras The Raster to copy.
- * @return A writable copy of <tt>ras</tt>
+ * @return A writable copy of <code>ras</code>
*/
public static WritableRaster copyRaster(Raster ras) {
return copyRaster(ras, ras.getMinX(), ras.getMinY());
@@ -369,13 +369,13 @@
/**
* Creates a new raster that has a <b>copy</b> of the data in
- * <tt>ras</tt>. This is highly optimized for speed. There is
+ * <code>ras</code>. This is highly optimized for speed. There is
* no provision for changing any aspect of the SampleModel.
* However you can specify a new location for the returned raster.
*
* This method should be used when you need to change the contents
* of a Raster that you do not "own" (ie the result of a
- * <tt>getData</tt> call).
+ * <code>getData</code> call).
*
* @param ras The Raster to copy.
*
@@ -385,7 +385,7 @@
* @param minY The y location for the upper left corner of the
* returned WritableRaster.
*
- * @return A writable copy of <tt>ras</tt>
+ * @return A writable copy of <code>ras</code>
*/
public static WritableRaster copyRaster(Raster ras, int minX, int minY) {
WritableRaster ret = Raster.createWritableRaster(
@@ -448,25 +448,25 @@
}
/**
- * Coerces <tt>ras</tt> to be writable. The returned Raster continues to
+ * Coerces <code>ras</code> to be writable. The returned Raster continues to
* reference the DataBuffer from ras, so modifications to the returned
* WritableRaster will be seen in ras.<p>
*
* This method should only be used if you need a WritableRaster due to
* an interface (such as to construct a BufferedImage), but have no
* intention of modifying the contents of the returned Raster. If
- * you have any doubt about other users of the data in <tt>ras</tt>,
+ * you have any doubt about other users of the data in <code>ras</code>,
* use copyRaster (above).
* @param ras The raster to make writable.
* @return A Writable version of ras (shares DataBuffer with
- * <tt>ras</tt>).
+ * <code>ras</code>).
*/
public static WritableRaster makeRasterWritable(Raster ras) {
return makeRasterWritable(ras, ras.getMinX(), ras.getMinY());
}
/**
- * Coerces <tt>ras</tt> to be writable. The returned Raster continues to
+ * Coerces <code>ras</code> to be writable. The returned Raster continues to
* reference the DataBuffer from ras, so modifications to the returned
* WritableRaster will be seen in ras.<p>
*
@@ -477,7 +477,7 @@
* This method should only be used if you need a WritableRaster due to
* an interface (such as to construct a BufferedImage), but have no
* intention of modifying the contents of the returned Raster. If
- * you have any doubt about other users of the data in <tt>ras</tt>,
+ * you have any doubt about other users of the data in <code>ras</code>,
* use copyRaster (above).
*
* @param ras The raster to make writable.
@@ -488,9 +488,9 @@
* @param minY The y location for the upper left corner of the
* returned WritableRaster.
*
- * @return A Writable version of <tT>ras</tt> with it's upper left
+ * @return A Writable version of <code>ras</code> with it's upper left
* hand coordinate set to minX, minY (shares it's DataBuffer
- * with <tt>ras</tt>).
+ * with <code>ras</code>).
*/
public static WritableRaster makeRasterWritable(Raster ras,
int minX, int minY) {
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/ImageException.java 2022-03-19 05:57:50.370576678 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/ImageException.java 2022-03-19 06:10:21.970499498 +0100
@@ -47,7 +47,7 @@
* @param message the detail message (which is saved for later retrieval
* by the {@link #getMessage()} method).
* @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
+ * {@link #getCause()} method). (A <code>null</code> value is
* permitted, and indicates that the cause is nonexistent or
* unknown.)
*/
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/SubImageNotFoundException.java 2022-03-19 05:57:50.374576706 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/SubImageNotFoundException.java 2022-03-19 06:13:43.971670909 +0100
@@ -47,7 +47,7 @@
* @param message the detail message (which is saved for later retrieval
* by the {@link #getMessage()} method).
* @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
+ * {@link #getCause()} method). (A <code>null</code> value is
* permitted, and indicates that the cause is nonexistent or
* unknown.)
*/
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/package.html 2022-03-19 05:57:50.370576678 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/package.html 2022-03-19 06:08:17.905826074 +0100
@@ -6,7 +6,7 @@
<body>
Classes, codecs and utilities for bitmap images.
-Contains extensions to the <tt>java.awt.image</tt> package. This
+Contains extensions to the <code>java.awt.image</code> package. This
package provides convenient methods, some utility classes and image
codec classes. These generally bypass broken methods in Java2D or
provide tweaked implementations.
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java 2022-03-19 06:03:49.176309802 +0100
@@ -52,19 +52,19 @@
// CSOFF: WhitespaceAround
/**
- * This extension of the <tt>java.awt.Graphics2D</tt> abstract class
- * is still abstract, but it implements a lot of the <tt>Graphics2D</tt>
+ * This extension of the <code>java.awt.Graphics2D</code> abstract class
+ * is still abstract, but it implements a lot of the <code>Graphics2D</code>
* method in a way that concrete implementations can reuse.
*
- * This class uses a <tt>GraphicContext</tt> to store the state of
+ * This class uses a <code>GraphicContext</code> to store the state of
* its various attributes that control the rendering, such as the
- * current <tt>Font</tt>, <tt>Paint</tt> or clip.
+ * current <code>Font</code>, <code>Paint</code> or clip.
*
* Concrete implementations can focus on implementing the rendering
- * methods, such as <tt>drawShape</tt>. As a convenience, rendering
+ * methods, such as <code>drawShape</code>. As a convenience, rendering
* methods that can be expressed with other rendering methods (e.g.,
- * <tt>drawRect</tt> can be expressed as <tt>draw(new Rectangle(..))</tt>),
- * are implemented by <tt>AbstractGraphics2D</tt>
+ * <code>drawRect</code> can be expressed as <code>draw(new Rectangle(..))</code>),
+ * are implemented by <code>AbstractGraphics2D</code>
*
* @version $Id: AbstractGraphics2D.java 1739071 2016-04-14 12:30:21Z ssteiner $
* @see org.apache.xmlgraphics.java2d.GraphicContext
@@ -74,7 +74,7 @@
public abstract class AbstractGraphics2D extends Graphics2D implements Cloneable {
/**
* Current state of the Graphic Context. The GraphicsContext
- * class manages the state of this <tt>Graphics2D</tt> graphic context
+ * class manages the state of this <code>Graphics2D</code> graphic context
* attributes.
*/
protected GraphicContext gc;
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java 2022-03-19 06:03:06.888077238 +0100
@@ -37,12 +37,12 @@
// CSOFF: WhitespaceAround
/**
- * This concrete implementation of <tt>AbstractGraphics2D</tt> is a
+ * This concrete implementation of <code>AbstractGraphics2D</code> is a
* simple help to programmers to get started with their own
- * implementation of <tt>Graphics2D</tt>.
- * <tt>DefaultGraphics2D</tt> implements all the abstract methods
- * is <tt>AbstractGraphics2D</tt> and makes it easy to start
- * implementing a <tt>Graphic2D</tt> piece-meal.
+ * implementation of <code>Graphics2D</code>.
+ * <code>DefaultGraphics2D</code> implements all the abstract methods
+ * is <code>AbstractGraphics2D</code> and makes it easy to start
+ * implementing a <code>Graphic2D</code> piece-meal.
*
* @version $Id: DefaultGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $
* @see org.apache.xmlgraphics.java2d.AbstractGraphics2D
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/AbstractPSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/AbstractPSDocumentGraphics2D.java 2022-03-19 06:07:42.073630781 +0100
@@ -30,9 +30,9 @@
import org.apache.xmlgraphics.ps.PSProcSets;
/**
- * This class is a wrapper for the <tt>PSGraphics2D</tt> that
+ * This class is a wrapper for the <code>PSGraphics2D</code> that
* is used to create a full document around the PostScript rendering from
- * <tt>PSGraphics2D</tt>.
+ * <code>PSGraphics2D</code>.
*
* @version $Id: AbstractPSDocumentGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $
* @see org.apache.xmlgraphics.java2d.ps.PSGraphics2D
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/EPSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/EPSDocumentGraphics2D.java 2022-03-19 06:12:41.715295301 +0100
@@ -24,7 +24,7 @@
import org.apache.xmlgraphics.ps.DSCConstants;
/**
- * This class is a wrapper for the <tt>AbstractPSDocumentGraphics2D</tt> that
+ * This class is a wrapper for the <code>AbstractPSDocumentGraphics2D</code> that
* is used to create EPS (Encapsulated PostScript) files instead of PS file.
*
* @version $Id: EPSDocumentGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSDocumentGraphics2D.java 2022-03-19 06:04:44.336619389 +0100
@@ -25,9 +25,9 @@
import org.apache.xmlgraphics.ps.DSCConstants;
/**
- * This class is a wrapper for the <tt>PSGraphics2D</tt> that
+ * This class is a wrapper for the <code>PSGraphics2D</code> that
* is used to create a full document around the PostScript rendering from
- * <tt>PSGraphics2D</tt>.
+ * <code>PSGraphics2D</code>.
*
* @version $Id: PSDocumentGraphics2D.java 1681108 2015-05-22 13:26:12Z ssteiner $
* @see org.apache.xmlgraphics.java2d.ps.PSGraphics2D
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2D.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2D.java 2022-03-19 06:04:16.840458169 +0100
@@ -57,8 +57,8 @@
import org.apache.xmlgraphics.ps.PSImageUtils;
/**
- * This is a concrete implementation of <tt>AbstractGraphics2D</tt> (and
- * therefore of <tt>Graphics2D</tt>) which is able to generate PostScript
+ * This is a concrete implementation of <code>AbstractGraphics2D</code> (and
+ * therefore of <code>Graphics2D</code>) which is able to generate PostScript
* code.
*
* @version $Id: PSGraphics2D.java 1845492 2018-11-01 15:54:06Z ssteiner $
--- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java 2022-03-19 05:57:50.378576733 +0100
+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java 2022-03-19 06:11:29.714873319 +0100
@@ -76,9 +76,9 @@
}
/**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
+ * Returns <code>true</code> if this map contains no key-value mappings.
*
- * @return <tt>true</tt> if this map contains no key-value mappings.
+ * @return <code>true</code> if this map contains no key-value mappings.
*/
public boolean isEmpty() {
if (flushOnRetrieval) {

View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Sat Mar 19 05:23:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* xmlgraphics-commons-javadoc17.patch
+ fix html5 errors that prevent javadoc generation with JDK 17
-------------------------------------------------------------------
Fri Mar 18 17:52:48 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -27,7 +27,6 @@ URL: http://xmlgraphics.apache.org/
Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
Patch0: xmlgraphics-commons-build_xml.patch
Patch1: xmlgraphics-commons-jdk10.patch
Patch2: xmlgraphics-commons-javadoc17.patch
BuildRequires: ant >= 1.6.5
BuildRequires: commons-io >= 1.1
BuildRequires: commons-logging
@ -58,7 +57,6 @@ Javadoc for package %{name}.
%setup -q %{name}-%{version}
%patch0
%patch1 -p1
%patch2 -p1
find . -name "*.jar" | xargs rm
%build