You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/12/25 22:43:04 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33921 fix rounding issue

Updated Branches:
  refs/heads/develop 73aabf2ce -> b727dfa46


FLEX-33921 fix rounding issue


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6bfa22fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6bfa22fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6bfa22fc

Branch: refs/heads/develop
Commit: 6bfa22fc783432ed829a23bd9c3cd75d35d76444
Parents: 73aabf2
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Dec 26 08:34:56 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Dec 26 08:34:56 2013 +1100

----------------------------------------------------------------------
 frameworks/projects/spark/src/spark/primitives/BitmapImage.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bfa22fc/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
index bc27a57..0588fae 100644
--- a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
+++ b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
@@ -1095,7 +1095,7 @@ public class BitmapImage extends GraphicElement
                 if ((!isNaN(percentWidth) && isNaN(percentHeight) && isNaN(explicitHeight)) ||
                     (!isNaN(percentHeight) && isNaN(percentWidth) && isNaN(explicitWidth)))
                 {
-                    if (aspectRatio != imageAspectRatio)
+                    if (Math.abs(aspectRatio - imageAspectRatio) > 0.001)
                     {
                         invalidateSize();
                         return;


[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33990 fix for RTE

Posted by jm...@apache.org.
FLEX-33990 fix for RTE


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b727dfa4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b727dfa4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b727dfa4

Branch: refs/heads/develop
Commit: b727dfa464266413ff786aeb49ace3dbe34db5ba
Parents: 6bfa22f
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Dec 26 08:40:44 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Dec 26 08:40:44 2013 +1100

----------------------------------------------------------------------
 .../controls/advancedDataGridClasses/AdvancedDataGridBase.as   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b727dfa4/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
index 08e0269..5e4f33b 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as
@@ -913,8 +913,10 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte
         for (var i:int = 0; i < n; i++)
         {
             var r:IListItemRenderer = listItems[rowIndex][i];
-			r.validateDisplayList();
-            updateDisplayOfItemRenderer(r);
+			if (r) {
+				r.validateDisplayList();
+            	updateDisplayOfItemRenderer(r);
+			}
         }
     }