Author: lbernardo
Date: Thu Feb 21 00:45:28 2013
New Revision: 1448483
URL: http://svn.apache.org/r1448483
Log:
FOP-2183: Use event producer when Colour Profile in PNG Image is bad; patch
submitted by Simon Steiner
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar?rev=1448483&r1=1448482&r2=1448483&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java?rev=1448483&r1=1448482&r2=1448483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
Thu Feb 21 00:45:28 2013
@@ -152,4 +152,12 @@ public interface ResourceEventProducer e
* @event.severity ERROR
*/
void catalogResolverNotCreated(Object source, String message);
+
+ /**
+ * Warning in an image.
+ * @param source the event source
+ * @param message warning
+ * @event.severity WARN
+ */
+ void imageWarning(Object source, String message);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml?rev=1448483&r1=1448482&r2=1448483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml Thu
Feb 21 00:45:28 2013
@@ -20,6 +20,7 @@
<message key="locator">[ (See position {loc})| (See {#gatherContextInfo})|
(No context info available)]</message>
<message key="imageNotFound">Image not found.[ URI:
{uri}.]{{locator}}</message>
<message key="imageError">Image not available.[ URI: {uri}.] Reason:[
{reason}][ {e}]{{locator}}</message>
+ <message key="imageWarning">Image warning.[ URI: {uri}.] Reason:[
{message}][ {e}]{{locator}}</message>
<message key="imageIOError">I/O error while loading image.[ URI: {uri}.][
Reason: {ioe}]{{locator}}</message>
<message key="ifoNoIntrinsicSize">The intrinsic dimensions of an
instream-foreign-object could not be determined.{{locator}}</message>
<message key="uriError">Error while handling URI: {uri}. Reason:
{e}{{locator}}</message>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java?rev=1448483&r1=1448482&r2=1448483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
Thu Feb 21 00:45:28 2013
@@ -155,10 +155,17 @@ public abstract class AbstractIFPainter<
context.putHints(hints);
ImageFlavor[] flavors =
imageHandlerRegistry.getSupportedFlavors(context);
+ info.getCustomObjects().put("warningincustomobject", true);
org.apache.xmlgraphics.image.loader.Image img = manager.getImage(
info, flavors,
hints, sessionContext);
+ if (info.getCustomObjects().get("warning") != null) {
+ ResourceEventProducer eventProducer =
ResourceEventProducer.Provider.get(
+ getUserAgent().getEventBroadcaster());
+ eventProducer.imageWarning(this,
(String)info.getCustomObjects().get("warning"));
+ }
+
try {
drawImage(img, rect, context);
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
