[Openutils-svn] SF.net SVN: openutils:[4452] magnoliamodules/branches/magnolia44

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

Revision: 4452
          http://openutils.svn.sourceforge.net/openutils/?rev=4452&view=rev
Author:   diego_schivo
Date:     2013-11-14 10:41:35 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Merged revisions 4451 via svnmerge from 
svn+ssh://diego_schivo@svn.code.sf.net/p/openutils/code/magnoliamodules/trunk

........
  r4451 | diego_schivo | 2013-11-14 11:33:12 +0100 (Thu, 14 Nov 2013) | 1 line
  
  MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev

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

Property Changed:
----------------
    magnoliamodules/branches/magnolia44/

Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44	2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44	2013-11-14 10:41:35 UTC (rev 4452)

Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276,4451
\ No newline at end of property
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-14 10:41:35 UTC (rev 4452)
@@ -272,7 +272,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/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-11-14 10:41:35 UTC (rev 4452)
@@ -60,5 +60,14 @@
     src="${pageContext.request.contextPath}${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.