[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ... |
|
Date: |
Wed, 07 May 2008 14:38:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/07 14:38:15
Modified files:
. : ChangeLog
backend : render_handler_agg.cpp
gui : gtk.cpp gui.cpp
Log message:
* backend/render_handler_agg.cpp: i18n.
* gui/gui.cpp: don't divide by zero; it annoys the matrices.
Fixes bug #23184.
* gui/gtk.cpp: nothing much, was just left over from debugging.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6543&r2=1.6544
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.177&r2=1.178
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.165&r2=1.166
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6543
retrieving revision 1.6544
diff -u -b -r1.6543 -r1.6544
--- ChangeLog 7 May 2008 14:21:51 -0000 1.6543
+++ ChangeLog 7 May 2008 14:38:13 -0000 1.6544
@@ -1,3 +1,10 @@
+2008-05-07 Benjamin Wolsey <address@hidden>
+
+ * backend/render_handler_agg.cpp: i18n.
+ * gui/gui.cpp: don't divide by zero; it annoys the matrices.
+ Fixes bug #23184.
+ * gui/gtk.cpp: nothing much, was just left over from debugging.
+
2008-05-07 Sandro Santilli <address@hidden>
* server/timers.cpp (execute): be more verbose about as coding
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- backend/render_handler_agg.cpp 6 May 2008 09:25:49 -0000 1.143
+++ backend/render_handler_agg.cpp 7 May 2008 14:38:14 -0000 1.144
@@ -625,7 +625,7 @@
// by default allow drawing everywhere
set_invalidated_region_world();
- log_debug("initialized AGG buffer <%p>, %d bytes, %dx%d, rowsize is %d
bytes",
+ log_debug(_("Initialized AGG buffer <%p>, %d bytes, %dx%d, rowsize is %d
bytes"),
(void*)mem, size, x, y, rowstride);
}
@@ -695,10 +695,10 @@
{
if (m_drawing_mask)
- log_debug("warning: rendering ended while drawing a mask");
+ log_debug(_("Warning: rendering ended while drawing a mask"));
while (! m_alpha_mask.empty()) {
- log_debug("warning: rendering ended while masks were still active");
+ log_debug(_("Warning: rendering ended while masks were still active"));
disable_mask();
}
@@ -895,8 +895,8 @@
rect ch_bounds = def->get_bound();
if (ch_bounds.is_null()) {
- log_debug("warning: select_clipbounds encountered a character definition
"
- "with null bounds");
+ log_debug(_("Warning: select_clipbounds encountered a character
definition "
+ "with null bounds"));
return;
}
@@ -985,7 +985,7 @@
select_clipbounds(def, mat);
if (_clipbounds_selected.empty()) {
- log_debug("warning: AGG renderer skipping a whole character");
+ log_debug(_("Warning: AGG renderer skipping a whole character"));
return; // nothing to draw!?
}
@@ -2025,7 +2025,6 @@
void set_scale(float new_xscale, float new_yscale) {
scale_set=true;
-
stage_matrix.set_identity();
stage_matrix.set_scale(new_xscale/20.0f, new_yscale/20.0f);
}
@@ -2097,9 +2096,9 @@
if (!pixelformat) return NULL;
if (is_little_endian_host())
- log_debug("framebuffer pixel format is %s (little-endian host)",
pixelformat);
+ log_debug(_("Framebuffer pixel format is %s (little-endian host)"),
pixelformat);
else
- log_debug("framebuffer pixel format is %s (big-endian host)", pixelformat);
+ log_debug(_("Framebuffer pixel format is %s (big-endian host)"),
pixelformat);
#ifdef PIXELFORMAT_RGB555
if (!strcmp(pixelformat, "RGB555"))
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- gui/gtk.cpp 27 Apr 2008 13:33:59 -0000 1.177
+++ gui/gtk.cpp 7 May 2008 14:38:14 -0000 1.178
@@ -1733,8 +1733,10 @@
GtkGui* gui = static_cast<GtkGui*>(data);
- int xmin = event->area.x, xmax = event->area.x + event->area.width,
- ymin = event->area.y, ymax = event->area.y + event->area.height;
+ const int xmin = event->area.x;
+ const int xmax = event->area.x + event->area.width;
+ const int ymin = event->area.y;
+ const int ymax = event->area.y + event->area.height;
gui->rerenderPixels(xmin, ymin, xmax, ymax);
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- gui/gui.cpp 29 Apr 2008 08:53:36 -0000 1.165
+++ gui/gui.cpp 7 May 2008 14:38:14 -0000 1.166
@@ -246,9 +246,12 @@
case movie_root::showAll:
{
- // set new scale value ( user-pixel / pseudo-pixel )
- _xscale = _width / swfwidth;
- _yscale = _height / swfheight;
+
+ // set new scale value ( user-pixel / pseudo-pixel ). Do
+ // not divide by zero, or we end up with an invalid
+ // stage matrix that returns nan values.
+ _xscale = (swfwidth == 0.0f) ? 1.0f : _width / swfwidth;
+ _yscale = (swfheight == 0.0f) ? 1.0f : _height /
swfheight;
// Scale proportionally, using smallest scale
if (_xscale < _yscale) _yscale = _xscale;
@@ -261,8 +264,8 @@
{
// set new scale value ( user-pixel / pseudo-pixel )
- _xscale = _width / swfwidth;
- _yscale = _height / swfheight;
+ _xscale = (swfwidth == 0.0f) ? 1.0f : _width / swfwidth;
+ _yscale = (swfheight == 0.0f) ? 1.0f : _height /
swfheight;
// Scale proportionally, using biggest scale
if (_xscale > _yscale) _yscale = _xscale;
@@ -274,8 +277,8 @@
case movie_root::exactFit:
{
// NOTE: changing aspect ratio is valid!
- _xscale = _width / swfwidth;
- _yscale = _height / swfheight;
+ _xscale = (swfwidth == 0.0f) ? 1.0f : _width / swfwidth;
+ _yscale = (swfheight == 0.0f) ? 1.0f : _height /
swfheight;
//LOG_ONCE( log_unimpl("Stage.scaleMode=exactFit") );
break;
}