Author: spouliot
Date: 2007-11-19 10:53:42 -0500 (Mon, 19 Nov 2007)
New Revision: 89932

Modified:
   trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
   trunk/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
Log:
2007-11-19  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * ImageAnimator.cs: Check for FrameDimension.Time availability before
        asking the frame count (since MS GDI+ prefers to return an error than
        saying it has a single frame). Fix bug #342733



Modified: trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog     2007-11-19 
15:22:55 UTC (rev 89931)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog     2007-11-19 
15:53:42 UTC (rev 89932)
@@ -1,3 +1,9 @@
+2007-11-19  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * ImageAnimator.cs: Check for FrameDimension.Time availability before
+       asking the frame count (since MS GDI+ prefers to return an error than
+       saying it has a single frame). Fix bug #342733
+
 2007-11-15  Geoff Norton  <[EMAIL PROTECTED]>
 
        * gdipFunctions.cs: Reflect the renamed environment variable in the new 
Carbon driver.

Modified: trunk/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs      
2007-11-19 15:22:55 UTC (rev 89931)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs      
2007-11-19 15:53:42 UTC (rev 89932)
@@ -103,7 +103,16 @@
                        if (image == null)
                                return false;
 
-                       return (image.GetFrameCount (FrameDimension.Time) > 1);
+                       int n = image.FrameDimensionsList.Length;
+                       if (n < 1)
+                               return false;
+
+                       for (int i = 0; i < n; i++) {
+                               if (image.FrameDimensionsList [i].Equals 
(FrameDimension.Time.Guid)) {
+                                       return (image.GetFrameCount 
(FrameDimension.Time) > 1);
+                               }
+                       }
+                       return false;
                }
 
                public static void StopAnimate (Image image, EventHandler 
onFrameChangeHandler)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to