You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/04/04 10:41:53 UTC

svn commit: r391248 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/reading/ImageReader.java status.xml

Author: jbq
Date: Tue Apr  4 01:41:52 2006
New Revision: 391248

URL: http://svn.apache.org/viewcvs?rev=391248&view=rev
Log:
Fix caching problems in ImageReader: image was not regenerated when
allow-enlarging or fit-uniform sitemap parameters were changed

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java?rev=391248&r1=391247&r2=391248&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java Tue Apr  4 01:41:52 2006
@@ -37,9 +37,7 @@
 
 import com.sun.image.codec.jpeg.ImageFormatException;
 import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGDecodeParam;
 import com.sun.image.codec.jpeg.JPEGEncodeParam;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
 
 /**
@@ -367,6 +365,8 @@
     */
     public Serializable getKey() {
         return super.getKey().toString()
+                + ':' + this.fitUniform
+                + ':' + this.enlarge
                 + ':' + this.width
                 + ':' + this.height
                 + ":" + this.scaleColor[0]

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=391248&r1=391247&r2=391248&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Apr  4 01:41:52 2006
@@ -181,6 +181,10 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.9" date="TBD">
+    <action dev="JBQ" type="fix">
+      Fix caching problems in ImageReader: image was not regenerated when allow-enlarging or fit-uniform sitemap
+      parameters were changed
+    </action>
     <action dev="JBQ" type="add" fixes-bug="COCOON-1809" due-to="Rob Berens" due-to-email="rberens@osirion.nl">
       CForms: Added event handling for group of type "choice" (allow formsOnShow attribute)
     </action>