Author: fejj
Date: 2007-06-14 23:37:26 -0400 (Thu, 14 Jun 2007)
New Revision: 79670
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/ffvideo.cpp
trunk/moon/src/runtime.cpp
trunk/moon/src/shape.cpp
trunk/moon/src/text.cpp
Log:
2007-06-14 Jeffrey Stedfast <[EMAIL PROTECTED]>
* text.cpp (getbounds): Revert prior change.
(getxformorigin): Same.
* shape.cpp (getbounds): Revert prior change.
* ffvideo.cpp (getbounds): Revert prior change.
* runtime.cpp (update_xform): Revert my last change.
(item_update_bounds): Same.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-06-15 03:22:50 UTC (rev 79669)
+++ trunk/moon/src/ChangeLog 2007-06-15 03:37:26 UTC (rev 79670)
@@ -1,3 +1,15 @@
+2007-06-14 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ * text.cpp (getbounds): Revert prior change.
+ (getxformorigin): Same.
+
+ * shape.cpp (getbounds): Revert prior change.
+
+ * ffvideo.cpp (getbounds): Revert prior change.
+
+ * runtime.cpp (update_xform): Revert my last change.
+ (item_update_bounds): Same.
+
2007-06-14 Jackson Harper <[EMAIL PROTECTED]>
* xaml.cpp: Set content properties when adding child elements. We
Modified: trunk/moon/src/ffvideo.cpp
===================================================================
--- trunk/moon/src/ffvideo.cpp 2007-06-15 03:22:50 UTC (rev 79669)
+++ trunk/moon/src/ffvideo.cpp 2007-06-15 03:37:26 UTC (rev 79670)
@@ -157,6 +157,9 @@
AVCodecContext *cc;
double res [6];
+ if (s == NULL)
+ return;
+
// If we have not been initialized yet, we cant compute the bounds
if (video_stream == NULL || video_stream->codec == NULL) {
x1 = y1 = x2 = y2 = 0;
Modified: trunk/moon/src/runtime.cpp
===================================================================
--- trunk/moon/src/runtime.cpp 2007-06-15 03:22:50 UTC (rev 79669)
+++ trunk/moon/src/runtime.cpp 2007-06-15 03:37:26 UTC (rev 79670)
@@ -443,11 +443,6 @@
void
item_update_bounds (UIElement *item)
{
- Surface *s = item_get_surface (item);
-
- if (s == NULL)
- return;
-
double cx1 = item->x1;
double cy1 = item->y1;
double cx2 = item->x2;
@@ -589,12 +584,8 @@
void
UIElement::update_xform ()
{
- Surface *s = item_get_surface (this);
cairo_matrix_t user_transform;
- if (s == NULL)
- return;
-
//
// What is more important, the space used by 6 doubles,
// or the time spent calling the parent (that will call
Modified: trunk/moon/src/shape.cpp
===================================================================
--- trunk/moon/src/shape.cpp 2007-06-15 03:22:50 UTC (rev 79669)
+++ trunk/moon/src/shape.cpp 2007-06-15 03:37:26 UTC (rev 79670)
@@ -199,6 +199,9 @@
{
Surface *s = item_get_surface (this);
+ if (s == NULL)
+ return;
+
cairo_save (s->cairo);
DoDraw (s, FALSE);
cairo_stroke_extents (s->cairo, &x1, &y1, &x2, &y2);
Modified: trunk/moon/src/text.cpp
===================================================================
--- trunk/moon/src/text.cpp 2007-06-15 03:22:50 UTC (rev 79669)
+++ trunk/moon/src/text.cpp 2007-06-15 03:37:26 UTC (rev 79670)
@@ -251,6 +251,9 @@
Surface *s = item_get_surface (this);
PangoRectangle ink, logical;
+ if (s == NULL)
+ return;
+
cairo_save (s->cairo);
cairo_set_matrix (s->cairo, &absolute_xform);
@@ -278,6 +281,9 @@
Surface *s = item_get_surface (this);
int width, height;
+ if (s == NULL)
+ return Point (0.0, 0.0);
+
cairo_save (s->cairo);
cairo_identity_matrix (s->cairo);
Draw (s, false);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
