jeremias 2004/08/16 12:29:04
Modified: src/java/org/apache/fop/image BmpImage.java JimiImage.java
JpegImage.java
Log:
Fix implementations after logging changes to correspond to the interface again.
Revision Changes Path
1.6 +4 -4 xml-fop/src/java/org/apache/fop/image/BmpImage.java
Index: BmpImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/BmpImage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BmpImage.java 31 Mar 2004 10:55:06 -0000 1.5
+++ BmpImage.java 16 Aug 2004 19:29:04 -0000 1.6
@@ -50,7 +50,7 @@
* @param ua the user agent
* @return true if it was loaded successfully
*/
- protected boolean loadBitmap(Log logger) {
+ protected boolean loadBitmap() {
int wpos = 18;
int hpos = 22; // offset positioning for w and height in bmp files
int[] headermap = new int[54];
@@ -88,7 +88,7 @@
}
}
} catch (IOException e) {
- logger.error("Error while loading image "
+ log.error("Error while loading image "
+ "" + " : "
+ e.getClass() + " - "
+ e.getMessage(), e);
@@ -118,7 +118,7 @@
} else if (this.bitsPerPixel == 4 || this.bitsPerPixel == 8) {
bytes = this.width / (8 / this.bitsPerPixel);
} else {
- logger.error("Image (" + ""
+ log.error("Image (" + ""
+ ") has " + this.bitsPerPixel
+ " which is not a supported BMP format.");
return false;
@@ -143,7 +143,7 @@
inputStream.close();
inputStream = null;
} catch (IOException e) {
- logger.error("Error while loading image "
+ log.error("Error while loading image "
+ "" + " : "
+ e.getClass() + " - "
+ e.getMessage(), e);
1.7 +6 -6 xml-fop/src/java/org/apache/fop/image/JimiImage.java
Index: JimiImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JimiImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JimiImage.java 31 Mar 2004 10:55:06 -0000 1.6
+++ JimiImage.java 16 Aug 2004 19:29:04 -0000 1.7
@@ -48,26 +48,26 @@
}
}
- protected boolean loadDimensions(Log logger) {
+ protected boolean loadDimensions() {
if (this.bitmaps == null) {
- loadImage(logger);
+ loadImage();
}
return this.bitmaps != null;
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadBitmap(Logger)
+ * @see org.apache.fop.image.AbstractFopImage#loadBitmap()
*/
- protected boolean loadBitmap(Log logger) {
+ protected boolean loadBitmap() {
if (this.bitmaps == null) {
- loadImage(logger);
+ loadImage();
}
return this.bitmaps != null;
}
- protected void loadImage(Log log) {
+ protected void loadImage() {
int[] tmpMap = null;
try {
ImageProducer ip =
1.7 +7 -8 xml-fop/src/java/org/apache/fop/image/JpegImage.java
Index: JpegImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/JpegImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JpegImage.java 31 Mar 2004 10:55:06 -0000 1.6
+++ JpegImage.java 16 Aug 2004 19:29:04 -0000 1.7
@@ -52,10 +52,9 @@
* This loads the original jpeg data and reads the color space,
* and icc profile if any.
*
- * @param ua the user agent
* @return true if loaded false for any error
*/
- protected boolean loadOriginalData(Log logger) {
+ protected boolean loadOriginalData() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ByteArrayOutputStream iccStream = new ByteArrayOutputStream();
int index = 0;
@@ -70,7 +69,7 @@
inputStream.close();
inputStream = null;
} catch (java.io.IOException ex) {
- logger.error("Error while loading image "
+ log.error("Error while loading image "
+ " : " + ex.getClass()
+ " - " + ex.getMessage(), ex);
return false;
@@ -115,7 +114,7 @@
*/
this.colorSpace = CMYKColorSpace.getInstance();
} else {
- logger.error("Unknown ColorSpace for image: "
+ log.error("Unknown ColorSpace for image: "
+ "");
return false;
}
@@ -157,7 +156,7 @@
}
}
} else {
- logger.error("Error while loading "
+ log.error("Error while loading "
+ "JpegImage - Invalid JPEG Header.");
return false;
}
@@ -166,7 +165,7 @@
try {
iccStream.write(align);
} catch (Exception e) {
- logger.error("Error while loading image "
+ log.error("Error while loading image "
+ " : "
+ e.getMessage(), e);
return false;
@@ -174,11 +173,11 @@
try {
iccProfile = ICC_Profile.getInstance(iccStream.toByteArray());
} catch (Exception e) {
- logger.error("Invalid ICC profile: " + e, e);
+ log.error("Invalid ICC profile: " + e, e);
return false;
}
} else if (this.colorSpace == null) {
- logger.error("ColorSpace not specified for JPEG image");
+ log.error("ColorSpace not specified for JPEG image");
return false;
}
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
