deweese 2002/11/14 06:09:13
Modified: sources/org/apache/batik/bridge DocumentLoader.java
sources/org/apache/batik/ext/awt/image/codec PNGRed.java
Log:
1) Fixed a bug for PNG reader with Indexed Image that have a bKGD chunk.
2) Fixed but 12118 - "Unable to load SVG file if path contains #"
PR: 12118
Revision Changes Path
1.16 +5 -2 xml-batik/sources/org/apache/batik/bridge/DocumentLoader.java
Index: DocumentLoader.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/DocumentLoader.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DocumentLoader.java 24 Jul 2002 11:50:25 -0000 1.15
+++ DocumentLoader.java 14 Nov 2002 14:09:13 -0000 1.16
@@ -83,7 +83,10 @@
* the document
*/
public Document loadDocument(String uri) throws IOException {
- int n = uri.indexOf('#');
+ int n = uri.lastIndexOf('/');
+ if (n == -1)
+ n = 0;
+ n = uri.indexOf('#', n);
if (n != -1) {
uri = uri.substring(0, n);
}
1.4 +5 -5
xml-batik/sources/org/apache/batik/ext/awt/image/codec/PNGRed.java
Index: PNGRed.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/codec/PNGRed.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PNGRed.java 24 Apr 2001 21:34:46 -0000 1.3
+++ PNGRed.java 14 Nov 2002 14:09:13 -0000 1.4
@@ -1029,14 +1029,14 @@
}
int r = 0, g = 0, b = 0;
- if (bitDepth < 8) {
- r = expandBits[bitDepth][bkgdRed];
- g = expandBits[bitDepth][bkgdGreen];
- b = expandBits[bitDepth][bkgdBlue];
- } else if (bitDepth == 8) {
+ if ((colorType == PNG_COLOR_PALETTE) || (bitDepth == 8)) {
r = bkgdRed;
g = bkgdGreen;
b = bkgdBlue;
+ } else if (bitDepth < 8) {
+ r = expandBits[bitDepth][bkgdRed];
+ g = expandBits[bitDepth][bkgdGreen];
+ b = expandBits[bitDepth][bkgdBlue];
} else if (bitDepth == 16) {
r = bkgdRed >> 8;
g = bkgdGreen >> 8;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
