Author: spouliot
Date: 2007-11-19 10:55:26 -0500 (Mon, 19 Nov 2007)
New Revision: 89933
Modified:
branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ChangeLog
branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
Log:
2007-11-19 Sebastien Pouliot <[EMAIL PROTECTED]>
[Backport r89932]
* 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: branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ChangeLog
2007-11-19 15:53:42 UTC (rev 89932)
+++ branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ChangeLog
2007-11-19 15:55:26 UTC (rev 89933)
@@ -1,3 +1,10 @@
+2007-11-19 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ [Backport r89932]
+ * 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-07 Geoff Norton <[EMAIL PROTECTED]>
* carbonFunctions.cs:
Modified:
branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
===================================================================
---
branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
2007-11-19 15:53:42 UTC (rev 89932)
+++
branches/mono-1-2-6/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
2007-11-19 15:55:26 UTC (rev 89933)
@@ -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