[Openutils-svn] SF.net SVN: openutils:[4451] magnoliamodules/trunk/openutils-mgnlmedia/src/ main

[<die...@us...>]

Revision: 4451
          http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev
Author:   diego_schivo
Date:     2013-11-14 10:33:12 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-14 10:33:12 UTC (rev 4451)
@@ -274,7 +274,9 @@
 
             AffineTransform at = new AffineTransform();
             double delta = ((double) x) / original.getWidth();
-            if (x > original.getWidth())
+            // MEDIA-307
+            // if (x > original.getWidth())
+            if (x >= original.getWidth())
             {
                 at.scale(delta, delta);
                 at.translate((canvasX - x) / (2 * delta), (canvasY - y) / (2 * delta));

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-11-14 10:33:12 UTC (rev 4451)
@@ -62,5 +62,14 @@
         <img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
       </div>
     </div>
+  <!--
+  <div>
+  <h3>MEDIA-307</h3>
+  <div>
+  <pre>media:urlres(mediaNode, 'o1000x600;background=FFFFFF')</pre> <img
+    src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o1000x600;background=FFFFFF')}" />
   </div>
+  </div>
+  -->
+  </div>
 </jsp:root>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.