You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/04/23 03:17:03 UTC
svn commit: r396190 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
Author: antonio
Date: Sat Apr 22 18:17:00 2006
New Revision: 396190
URL: http://svn.apache.org/viewcvs?rev=396190&view=rev
Log:
Merge from branch 2.1.
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java?rev=396190&r1=396189&r2=396190&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java Sat Apr 22 18:17:00 2006
@@ -270,7 +270,7 @@
* for example) crashes the entire JVM (yes, dude, the bug is *that* nasty
* since it happens in JPEG routines which are native!)
* I'm perfectly aware of the huge memory problems that this causes (almost
- * doubling memory consuption for each image and making the GC work twice
+ * doubling memory consumption for each image and making the GC work twice
* as hard) but it's *far* better than restarting the JVM every 2 minutes
* (since this is the average experience for image-intensive web application
* such as an image gallery).
@@ -365,6 +365,8 @@
*/
public Serializable getKey() {
return super.getKey().toString()
+ + ':' + this.fitUniform
+ + ':' + this.enlarge
+ ':' + this.width
+ ':' + this.height
+ ":" + this.scaleColor[0]
Re: svn commit: r396190 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
Posted by Jean-Baptiste Quenot <jb...@apache.org>.
* antonio@apache.org:
> Author: antonio
> Date: Sat Apr 22 18:17:00 2006
> New Revision: 396190
>
> URL: http://svn.apache.org/viewcvs?rev=396190&view=rev
> Log:
> Merge from branch 2.1.
>
> Modified:
> cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
>
> @@ -365,6 +365,8 @@
> */
> public Serializable getKey() {
> return super.getKey().toString()
> + + ':' + this.fitUniform
> + + ':' + this.enlarge
> + ':' + this.width
> + ':' + this.height
> + ":" + this.scaleColor[0]
Thanks Antonio for merging this fix, I forgot to do it in trunk.
--
Jean-Baptiste Quenot
aka John Banana Qwerty
http://caraldi.com/jbq/