[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-1138-gc0d7d7a |
|
Date: |
Mon, 22 Aug 2011 16:01:45 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, hwaccel has been updated
via c0d7d7abc0775132f5a2136d5c1b1057d4435aa3 (commit)
via ec172628a9feb22ff40796e890df7d43a89c796f (commit)
via 74a14bc5cf9757bd9e01ff13e398f5c67c9a6b57 (commit)
via 25197c22ebd00b85c1089fc97bd1a0348e320ff0 (commit)
via c2b40ddac65c618b89a82151c4cab5464bf69d79 (commit)
via 0ac5315c86112e291d7268583f0d6775108af7f7 (commit)
via 515e64a82f7077359c99cf9d1e8a370a7d9fa1d2 (commit)
via 354169ed1348d011093af8039da4ffaf3aac10b7 (commit)
via 8813f8d9f6c09e11ccadebbb4001d3279817505a (commit)
via a1d50e638d4bd9f28bb6bae615a531635b42c1df (commit)
via 8ccbf7348862ba7aab9fd1e871464e5dab74d631 (commit)
via 2cba2bac31734e1c33465c0cf929f29d5d226ac3 (commit)
via b787ed547dc1de96be8c3b7227ac1fa0754cd601 (commit)
via af836334e912d587e38bdd8ca0ae3a3f38cb56df (commit)
via 201a9ddfd4e264e9bd5e4583cab6f4e0b360d0df (commit)
via 9fe7cd8a282c6f15e01da2ecb07ba0f0b2435e61 (commit)
via c4a8abb6035fd62ca94ed4925e2ea1ced8ed2125 (commit)
via f41b240d22c38a85bc69a2437bc840f2af8dfd94 (commit)
via edc8bfd753d8b25eb96b96b338b432f9069d4d4e (commit)
via 02b2e3e69e410c8700aebd5606af0c083665ac24 (commit)
via ef00e3c89b18c50bd862e56f715d49a60e44cfa3 (commit)
via ce8da6f464abce2615f0ad069d53bcd24c0c64f9 (commit)
via 7a37482830606aed2b41f1428d65c10edfb59962 (commit)
via 89024843114a7b0359c267f172d4c741e7cdea7d (commit)
via 94cb9598c4008789f2fb0b5d03e42ed37ee401b3 (commit)
via 05bdc969ed629967c6b34f3f95e50a2c5991cbef (commit)
via a38ca8f8df55bf339c8ecce2c5a3d80f0c47362e (commit)
via eae7855ac38f78618f1a0871df2aa12c81edfa3f (commit)
via 02d8a6c1b9192be48e5ebb1870c8679f75fe45b8 (commit)
via 25e60d2c7882f7237e286d51133a480527803b4e (commit)
via 3573d0ab52d3e3273a3a735ddd64cd9e9f36e1f8 (commit)
via db46a406460391fdf26195c0fa30fbe462eae76a (commit)
via 24680bfe7be8759f0ad08186bc052d10fca270c7 (commit)
via f57b159cbcd4dfc22a34a0714c53ff66ad753b4f (commit)
via a5b32638c76501a57c62e0414efb18bed39bb3ca (commit)
via bceff43749abd7e0d85321621bfedc7ca6b03ff2 (commit)
via dd3969779aa8470fca24de081eb4de909fa586af (commit)
via 3a590ee72055366634cce51bdcd8762aebf6aa10 (commit)
via f65ac5d9dddcb9ca2a9f2c3e61067f69b727fe8c (commit)
via 266533ba1a14390932548a920263e003945a89c1 (commit)
via 02ca2ae1e96753d603774c1350af46d95952ca93 (commit)
via 959ef1c13b45c4aa3705a0036b13a4b7e50c7fd1 (commit)
via bcbe20ae3aefde22c7f470b0284cba20be373589 (commit)
from 69a74b9572835008f8595077878f7687f1d7673c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c0d7d7abc0775132f5a2136d5c1b1057d4435aa3
commit c0d7d7abc0775132f5a2136d5c1b1057d4435aa3
Author: Rob Savoye <address@hidden>
Date: Mon Aug 22 10:01:20 2011 -0600
drop a few blank lines
diff --git a/librender/opengles1/Renderer_gles1.cpp
b/librender/opengles1/Renderer_gles1.cpp
index 707f670..878211f 100644
--- a/librender/opengles1/Renderer_gles1.cpp
+++ b/librender/opengles1/Renderer_gles1.cpp
@@ -16,7 +16,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
#endif
@@ -125,8 +124,6 @@ Renderer_gles1::drawVideoFrame(image::GnashImage* /* frame
*/,
log_unimpl("drawVideoFrame");
}
-
-
void
Renderer_gles1::world_to_pixel(int& /* x */, int& /* y */, float /* world_x
*/, float /* world_y */) const
{
http://git.savannah.gnu.org/cgit//commit/?id=ec172628a9feb22ff40796e890df7d43a89c796f
commit ec172628a9feb22ff40796e890df7d43a89c796f
Author: Rob Savoye <address@hidden>
Date: Mon Aug 22 10:00:27 2011 -0600
eliminate warnings, even though this is mostly just stubs for future de
elopment.
diff --git a/librender/opengles1/Renderer_gles1.cpp
b/librender/opengles1/Renderer_gles1.cpp
index cd4d319..707f670 100644
--- a/librender/opengles1/Renderer_gles1.cpp
+++ b/librender/opengles1/Renderer_gles1.cpp
@@ -103,7 +103,7 @@ Renderer_gles1::~Renderer_gles1()
}
void
-Renderer_gles1::init(float x, float y)
+Renderer_gles1::init(float /* x */, float /* y */)
{
GNASH_REPORT_FUNCTION;
}
@@ -112,11 +112,13 @@ CachedBitmap *
Renderer_gles1::createCachedBitmap(std::auto_ptr<gnash::image::GnashImage>)
{
GNASH_REPORT_FUNCTION;
+
+ return 0;
}
void
Renderer_gles1::drawVideoFrame(image::GnashImage* /* frame */,
- const gnash::Transform& t/* m */,
+ const gnash::Transform& /* m */,
const SWFRect* /* bounds */, bool /*smooth*/)
{
GNASH_REPORT_FUNCTION;
@@ -126,7 +128,7 @@ Renderer_gles1::drawVideoFrame(image::GnashImage* /* frame
*/,
void
-Renderer_gles1::world_to_pixel(int& x, int& y, float world_x, float world_y)
const
+Renderer_gles1::world_to_pixel(int& /* x */, int& /* y */, float /* world_x
*/, float /* world_y */) const
{
#if 0
// negative pixels seems ok here... we don't
@@ -171,12 +173,14 @@ Renderer_gles1::world_to_pixel(const
geometry::Range2d<float>& wb) const
point
Renderer_gles1::pixel_to_world(int x, int y) const
{
-#if 0
point p(x, y);
+#if 0
SWFMatrix mat = stage_matrix;
mat.invert().transform(p);
return p;
#endif
+
+ return p;
};
void
@@ -193,15 +197,15 @@ Renderer_gles1::end_display()
}
void
-Renderer_gles1::drawLine(const std::vector<point>& coords, const rgba& fill,
- const SWFMatrix& mat)
+Renderer_gles1::drawLine(const std::vector<point>& /* coords */, const rgba&
/* fill */,
+ const SWFMatrix& /* mat */)
{
GNASH_REPORT_FUNCTION;
}
void
-Renderer_gles1::draw_poly(const std::vector<point>& corners,
- const rgba& fill, const rgba& /* outline */,
- const SWFMatrix& mat, bool /* masked */)
+Renderer_gles1::draw_poly(const std::vector<point>& /* corners */,
+ const rgba& /* fill */, const rgba& /* outline */,
+ const SWFMatrix& /* mat */, bool /* masked */)
{
GNASH_REPORT_FUNCTION;
}
@@ -217,8 +221,8 @@ Renderer_gles1::drawShape(const gnash::SWF::ShapeRecord&,
const gnash::Transform
// GNASH_REPORT_FUNCTION;
// }
void
-Renderer_gles1::drawGlyph(const SWF::ShapeRecord& rec, const rgba& c,
- const SWFMatrix& mat)
+Renderer_gles1::drawGlyph(const SWF::ShapeRecord& /* rec */, const rgba& /* c
*/,
+ const SWFMatrix& /* mat */)
{
GNASH_REPORT_FUNCTION;
}
@@ -248,18 +252,21 @@ Renderer_gles1::end_submit_mask()
apply_mask();
#endif
}
+
void
Renderer_gles1::apply_mask()
{
GNASH_REPORT_FUNCTION;
}
+
void
Renderer_gles1::disable_mask()
{
GNASH_REPORT_FUNCTION;
}
+
void
-Renderer_gles1::set_scale(float xscale, float yscale)
+Renderer_gles1::set_scale(float /* xscale */, float /* yscale */)
{
GNASH_REPORT_FUNCTION;
#if 0
@@ -277,7 +284,7 @@ Renderer_gles1::set_invalidated_regions(const
InvalidatedRanges& /* ranges */)
}
bool
-Renderer_gles1::initTestBuffer(unsigned int width, unsigned int height)
+Renderer_gles1::initTestBuffer(unsigned int /* width */, unsigned int /*
height */)
{
GNASH_REPORT_FUNCTION;
#if 0
@@ -297,6 +304,8 @@ Renderer *
Renderer_gles1::startInternalRender(gnash::image::GnashImage&)
{
GNASH_REPORT_FUNCTION;
+
+ return 0;
}
void
@@ -306,7 +315,7 @@ Renderer_gles1::endInternalRender()
}
Renderer *
-create_handler(const char *pixelformat)
+create_handler(const char * /*pixelformat */)
{
GNASH_REPORT_FUNCTION;
Renderer_gles1 *renderer = new Renderer_gles1;
http://git.savannah.gnu.org/cgit//commit/?id=74a14bc5cf9757bd9e01ff13e398f5c67c9a6b57
commit 74a14bc5cf9757bd9e01ff13e398f5c67c9a6b57
Merge: 8813f8d 25197c2
Author: Rob Savoye <address@hidden>
Date: Sat Aug 20 22:10:26 2011 -0600
Merge branch 'master' into hwaccel
http://git.savannah.gnu.org/cgit//commit/?id=8813f8d9f6c09e11ccadebbb4001d3279817505a
commit 8813f8d9f6c09e11ccadebbb4001d3279817505a
Merge: a1d50e6 8ccbf73
Author: Rob Savoye <address@hidden>
Date: Sat Aug 13 08:53:20 2011 -0600
Merge branch 'master' into hwaccel
http://git.savannah.gnu.org/cgit//commit/?id=a1d50e638d4bd9f28bb6bae615a531635b42c1df
commit a1d50e638d4bd9f28bb6bae615a531635b42c1df
Merge: 201a9dd b787ed5
Author: Rob Savoye <address@hidden>
Date: Sat Aug 13 08:53:16 2011 -0600
merge from master
diff --cc librender/openvg/OpenVGStyle.h
index ac79f80,0000000..d048fa5
mode 100644,000000..100644
--- a/librender/openvg/OpenVGStyle.h
+++ b/librender/openvg/OpenVGStyle.h
@@@ -1,187 -1,0 +1,301 @@@
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+// Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#ifndef GNASH_OPENVG_STYLE_H
+#define GNASH_OPENVG_STYLE_H
+
+#include "CachedBitmap.h"
+#include "GnashImage.h"
+#include "Renderer.h"
++#include "FillStyle.h"
++#include "SWFCxForm.h"
++#include "SWFMatrix.h"
+
+namespace gnash {
+
+class SolidFill;
+class GradientFill;
+class BitmapFill;
+class rgba;
++class StyleHandler;
+
+namespace renderer {
+
+namespace openvg {
+
++// Forward declarations.
++namespace {
++ /// Creates 8 bitmap functions
++ template<typename FillMode, typename Pixel>
++ void storeBitmap(StyleHandler& st, const OpenVGBitmap* bi,
++ const SWFMatrix& mat, const SWFCxForm& cx,
++ bool smooth);
++ template<typename FillMode> void storeBitmap(StyleHandler& st,
++ const OpenVGBitmap* bi, const SWFMatrix& mat, const SWFCxForm& cx,
++ bool smooth);
++
++ /// Creates many (should be 18) gradient functions.
++ void storeGradient(StyleHandler& st, const GradientFill& fs,
++ const SWFMatrix& mat, const SWFCxForm& cx);
++ template<typename Spread> void storeGradient(StyleHandler& st,
++ const GradientFill& fs, const SWFMatrix& mat, const SWFCxForm&
cx);
++ template<typename Spread, typename Interpolation>
++ void storeGradient(StyleHandler& st, const GradientFill& fs,
++ const SWFMatrix& mat, const SWFCxForm& cx);
++}
++
+/// @note These helper functions are used by the boost::variant used
+/// for fill styles. A variant is a C++ style version of the C union.
+/// Before accessing any of the data of the variant, we have to use
+/// boost::apply_visitor() to bind one of these classes to the style
+/// to extract the data.
+
++/// Transfer FillStyles to OpenVG styles.
++struct OpenVGStyles : boost::static_visitor<>
++{
++ OpenVGStyles(SWFMatrix stage, SWFMatrix fill, const SWFCxForm& c,
++ StyleHandler& sh, Quality q)
++ : _stageMatrix(stage.invert()),
++ _fillMatrix(fill.invert()),
++ _cx(c),
++ _sh(sh),
++ _quality(q)
++ {
++ GNASH_REPORT_FUNCTION;
++ }
++
++ void operator()(const GradientFill& f) const {
++ SWFMatrix m = f.matrix();
++ m.concatenate(_fillMatrix);
++ m.concatenate(_stageMatrix);
++ storeGradient(_sh, f, m, _cx);
++ }
++
++ void operator()(const SolidFill& f) const {
++ const rgba color = _cx.transform(f.color());
++
++ // add the color to our self-made style handler (basically
++ // just a list)
++ // _sh.add_color(agg::rgba8_pre(color.m_r, color.m_g, color.m_b,
++ // color.m_a));
++ }
++
++ void operator()(const BitmapFill& f) const {
++ SWFMatrix m = f.matrix();
++ m.concatenate(_fillMatrix);
++ m.concatenate(_stageMatrix);
++
++ // Smoothing policy:
++ //
++ // - If unspecified, smooth when _quality >= BEST
++ // - If ON or forced, smooth when _quality > LOW
++ // - If OFF, don't smooth
++ //
++ // TODO: take a forceBitmapSmoothing parameter.
++ // which should be computed by the VM looking
++ // at MovieClip.forceSmoothing.
++ bool smooth = false;
++ if (_quality > QUALITY_LOW) {
++ // TODO: if forceSmoothing is true, smooth !
++ switch (f.smoothingPolicy()) {
++ case BitmapFill::SMOOTHING_UNSPECIFIED:
++ if (_quality >= QUALITY_BEST) {
++ smooth = true;
++ }
++ break;
++ case BitmapFill::SMOOTHING_ON:
++ smooth = true;
++ break;
++ default: break;
++ }
++ }
++
++ const bool tiled = (f.type() == BitmapFill::TILED);
++
++ const CachedBitmap* bm = f.bitmap();
++
++#if 0
++ if (!bm) {
++ // See misc-swfmill.all/missing_bitmap.swf
++ _sh.add_color(agg::rgba8_pre(255,0,0,255));
++ } else if ( bm->disposed() ) {
++ // See misc-ming.all/BeginBitmapFill.swf
++ _sh.add_color(agg::rgba8_pre(0,0,0,0));
++ } else {
++ _sh.add_bitmap(dynamic_cast<const agg_bitmap_info*>(bm),
++ m, _cx, tiled, smooth);
++ }
++#endif
++ }
++
++private:
++ /// The inverted stage matrix.
++ const SWFMatrix _stageMatrix;
++
++ /// The inverted fill matrix.
++ const SWFMatrix _fillMatrix;
++ const SWFCxForm& _cx;
++ StyleHandler& _sh;
++ const Quality _quality;
++};
++
+/// Get the color of a style from the variant
+class GetColor : public boost::static_visitor<rgba>
+{
+public:
+ rgba operator()(const SolidFill& f) const {
+ return f.color();
+ }
+ rgba operator()(const GradientFill&) const {
+ return rgba();
+ }
+ rgba operator()(const BitmapFill&) const {
+ return rgba();
+ }
+};
+
+/// Get the fill type. Each fill type has it's own sub types,
+/// so we map the sub type name to the fill type name.
+class GetType : public boost::static_visitor<SWF::FillType>
+{
+public:
+ SWF::FillType operator()(const SolidFill&) const {
+ return SWF::FILL_SOLID;
+ }
+ SWF::FillType operator()(const GradientFill& g) const {
+ switch (g.type()) {
+ case GradientFill::LINEAR:
+ return SWF::FILL_LINEAR_GRADIENT;
+ break;
+ case GradientFill::RADIAL:
+ return SWF::FILL_RADIAL_GRADIENT;
+ break;
+ default:
+ break;
+ }
+ }
+ SWF::FillType operator()(const BitmapFill& b) const {
+ switch (b.type()) {
+ case BitmapFill::TILED:
+ if (b.smoothingPolicy() == BitmapFill::SMOOTHING_OFF) {
+ return SWF::FILL_TILED_BITMAP_HARD;
+ } else {
+ return SWF::FILL_TILED_BITMAP;
+ }
+ break;
+ case BitmapFill::CLIPPED:
+ if (b.smoothingPolicy() == BitmapFill::SMOOTHING_OFF) {
+ return SWF::FILL_CLIPPED_BITMAP_HARD;
+ } else {
+ return SWF::FILL_CLIPPED_BITMAP;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+};
+
+/// Get the bitmap data of a style from the variant
+class GetBitmap : public boost::static_visitor<CachedBitmap *>
+{
+public:
+ CachedBitmap *operator()(const SolidFill&) const {
+ return 0;
+ }
+ CachedBitmap *operator()(const GradientFill&) const {
+ return 0;
+ }
+ CachedBitmap *operator()(const BitmapFill& b) const {
+ return const_cast<CachedBitmap *>(b.bitmap());
+ }
+};
+
+/// Get the image from style variant
+class GetImage : public boost::static_visitor<image::GnashImage *>
+{
+public:
+ image::GnashImage *operator()(const SolidFill&) const {
+ return 0;
+ }
+ image::GnashImage *operator()(const GradientFill&) const {
+ return 0;
+ }
+ image::GnashImage *operator()(const BitmapFill& b) const {
+ CachedBitmap *cb = const_cast<CachedBitmap *>(b.bitmap());
+ image::GnashImage &im = cb->image();
+// image::GnashImage::const_iterator it = const_cast<CachedBitmap
*>(cb)->image().begin();
+ return &im;
+ }
+};
+
+/// Get the matrix of a style from the variant
+class GetMatrix : public boost::static_visitor<SWFMatrix>
+{
+public:
+ SWFMatrix operator()(const SolidFill&) const {
+ }
+ SWFMatrix operator()(const GradientFill& g) const {
+ return g.matrix();
+ }
+ SWFMatrix operator()(const BitmapFill& b) const {
+ return b.matrix();
+ }
+};
+
+/// GradientFills have more data we need to construct the gradient.
+
+/// Return the focal point of a radial gradient
+class GetFocalPoint : public boost::static_visitor<double>
+{
+public:
+ double operator()(const SolidFill&) const {
+ return 0.0f;
+ }
+ double operator()(const GradientFill& g) const {
+ return g.focalPoint();
+ }
+ double operator()(const BitmapFill&) const {
+ return 0.0f;
+ }
+};
+
+/// Return the records in the gradient
+class GetGradientRecords : public boost::static_visitor<const
GradientFill::GradientRecords &>
+{
+public:
+ const GradientFill::GradientRecords &operator()(const SolidFill&) const {
+ }
+ const GradientFill::GradientRecords &operator()(const GradientFill& fs)
const {
+ return fs.getRecords();
+ }
+ const GradientFill::GradientRecords &operator()(const BitmapFill&) const {
+ }
+};
+
+
+} // namespace gnash::renderer::openvg
+} // namespace gnash::renderer
+} // namespace gnash
+
+#endif // __RENDER_OPENVG_STYLE_H__
+
+// local Variables:
+// mode: C++
+// indent-tabs-mode: nil
+// End:
http://git.savannah.gnu.org/cgit//commit/?id=201a9ddfd4e264e9bd5e4583cab6f4e0b360d0df
commit 201a9ddfd4e264e9bd5e4583cab6f4e0b360d0df
Author: Rob Savoye <address@hidden>
Date: Fri Aug 12 08:56:46 2011 -0600
create_Renderer_ogl is now renderer::opengl::create_handler
diff --git a/testsuite/MovieTester.cpp b/testsuite/MovieTester.cpp
index f8250f9..4f8ccc8 100644
--- a/testsuite/MovieTester.cpp
+++ b/testsuite/MovieTester.cpp
@@ -565,7 +565,7 @@ MovieTester::initTestingRenderers()
#ifdef RENDERER_OPENGL
// Initialize opengl renderer
- handler.reset(create_Renderer_ogl(false));
+ handler.reset(renderer::opengl::create_handler(false));
addTestingRenderer(handler, "OpenGL");
#endif
}
http://git.savannah.gnu.org/cgit//commit/?id=9fe7cd8a282c6f15e01da2ecb07ba0f0b2435e61
commit 9fe7cd8a282c6f15e01da2ecb07ba0f0b2435e61
Author: Rob Savoye <address@hidden>
Date: Fri Aug 12 08:28:51 2011 -0600
eliminate unused variable warning
diff --git a/libdevice/rawfb/test_rawfb.cpp b/libdevice/rawfb/test_rawfb.cpp
index 31828ec..9df67de 100644
--- a/libdevice/rawfb/test_rawfb.cpp
+++ b/libdevice/rawfb/test_rawfb.cpp
@@ -143,7 +143,6 @@ main(int argc, char *argv[])
// This is a manual test to see if we can draw a line on the
// raw framebuffer to make sure it got initialized correctly.
int x = 0, y = 0;
- int xoff = 0, yoff = 0;
long location = 0;
int line_length = rfb.getWidth() * ((rfb.getDepth()+7)/8);
http://git.savannah.gnu.org/cgit//commit/?id=c4a8abb6035fd62ca94ed4925e2ea1ced8ed2125
commit c4a8abb6035fd62ca94ed4925e2ea1ced8ed2125
Author: Rob Savoye <address@hidden>
Date: Fri Aug 12 08:17:34 2011 -0600
eliminate unused variable warning
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index fc93759..d6957a8 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -62,7 +62,7 @@ SharedLib::SharedLib(const std::string& filespec)
_filespec = filespec;
}
-SharedLib::SharedLib(const std::string& filespec, const std::string& envvar)
+SharedLib::SharedLib(const std::string& filespec, const std::string& /* envvar
*/)
{
_filespec = filespec;
scoped_lock lock(_libMutex);
http://git.savannah.gnu.org/cgit//commit/?id=f41b240d22c38a85bc69a2437bc840f2af8dfd94
commit f41b240d22c38a85bc69a2437bc840f2af8dfd94
Merge: edc8bfd 8902484
Author: Rob Savoye <address@hidden>
Date: Fri Aug 12 08:16:09 2011 -0600
merge from master
diff --cc configure.ac
index 514f589,0f00b6c..14e7f39
--- a/configure.ac
+++ b/configure.ac
@@@ -2033,53 -1873,9 +2033,19 @@@ AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAV
dnl X11 is needed for fltk (at least),
dnl and probably for many other guis too ...
+dnl if ! test x$build_fb = xyes; then # <--- this is wrong as build_x is
non-exclusive
+dnl AC_PATH_XTRA
+dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
+dnl AC_CHECK_LIB(gmp, _gmp_get_memory_functions)
GNASH_PATH_X11
-AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
+AC_CHECK_LIB(Xi, XInput_find_display)
+AC_CHECK_LIB(X11, XDisableAccessControl)
+dnl fi
+AM_CONDITIONAL(HAVE_X11, [test x${has_x11} = xyes])
+if test x${build_x11_device} = xyes -a x${has_x11} = xyes; then
+ AC_DEFINE(BUILD_X11_DEVICE, [1], [Build the X11 device])
+fi
- AC_CHECK_LIB(rt, shm_unlink)
- AC_CHECK_FUNCS(shm_open shm_unlink)
-
- dnl if test x$cross_compiling = xno; then
- AC_LANG_PUSH(C++)
- AC_MSG_CHECKING([to see if float formatting is broken])
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([#include <cmath>
- void testFloat(double d, double& s)
- {
- d /= 1000.0;
- s = std::fmod(d, 86400.0);
- }], [
- double d = 3.0935415006117e+23;
- double s;
- testFloat(d, s);
- if (static_cast<int>(s) != 61440) {
- return 1;
- }])], dnl end of LANG_PROGRAM
- broken_float=no, dnl returns 0, works
- broken_float=yes, dnl returns 1, broken
- broken_float=no dnl cross compiling
- ) dnl end of RUN_IFELSE
- AC_LANG_POP(C++)
- dnl fi
-
- if test x${broken_float} = xyes; then
- AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_BROKEN_FLOAT, [1], [Has broken float support])
- else
- AC_MSG_RESULT([no])
- fi
- AM_CONDITIONAL(BROKEN_FLOAT, [ test x$broken_float = xyes ])
-
dnl See if ipc_perm structure has the ipc_perm.key field, and if so,
dnl which variant of the name is used.
ipc_key=no
diff --cc libcore/FillStyle.h
index f8e0ee6,13d7548..4053f71
--- a/libcore/FillStyle.h
+++ b/libcore/FillStyle.h
@@@ -308,9 -306,22 +309,21 @@@ void setLerp(FillStyle& f, const FillSt
DSOEXPORT std::ostream& operator<<(std::ostream& os,
const BitmapFill::SmoothingPolicy& p);
+ /// Output operator for FillStyles.
+ std::ostream& operator<<(std::ostream& os, const FillStyle& fs);
+
+ /// Output operator for GradientFill type.
+ std::ostream& operator<<(std::ostream& o, GradientFill::Type t);
+
+ /// Output operator for GradientFill spread mode.
+ std::ostream& operator<<(std::ostream& o, GradientFill::SpreadMode t);
+
+ /// Output operator for GradientFill interpolation mode.
+ std::ostream& operator<<(std::ostream& o, GradientFill::InterpolationMode t);
+
} // namespace gnash
-#endif
-
+#endif
// Local Variables:
// mode: C++
http://git.savannah.gnu.org/cgit//commit/?id=edc8bfd753d8b25eb96b96b338b432f9069d4d4e
commit edc8bfd753d8b25eb96b96b338b432f9069d4d4e
Author: Rob Savoye <address@hidden>
Date: Fri Aug 12 08:14:04 2011 -0600
fix comment typos
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index aacaccc..8bd23bb 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -90,14 +90,14 @@ AC_DEFUN([GNASH_PATH_OPENVG],
fi
dnl Ubuntu Oneric (11.10) has moved the OpenVG libraries to an
architecture
dnl specific directory, I assume to separate the two library versions
between
- dnl X11 (Mesa) and a frasmebuffer.
+ dnl X11 (Mesa) and a framebuffer.
if test -f $i/mesa-egl/libOpenVG.${shlibext} -o -f
$i/mesa-egl/libOpenVG.a; then
ac_cv_path_openvg_lib="-L$i/mesa-egl -lOpenVG"
break
fi
done
dnl The Babbage board wants libgsl too. We put this in a separate
- dnl vatiable because all the executables need it when statically
+ dnl variable because all the executables need it when statically
dnl linking. With Ltib, when cross compiling, these are needed at
dnl link time.
if test -f $i/libgsl.${shlibext} -o -f $i/libgsl.a; then
http://git.savannah.gnu.org/cgit//commit/?id=02b2e3e69e410c8700aebd5606af0c083665ac24
commit 02b2e3e69e410c8700aebd5606af0c083665ac24
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 17:10:45 2011 -0600
add comment about oneric and openvg library locations.
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index b76ec89..aacaccc 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -88,6 +88,9 @@ AC_DEFUN([GNASH_PATH_OPENVG],
break
fi
fi
+ dnl Ubuntu Oneric (11.10) has moved the OpenVG libraries to an
architecture
+ dnl specific directory, I assume to separate the two library versions
between
+ dnl X11 (Mesa) and a frasmebuffer.
if test -f $i/mesa-egl/libOpenVG.${shlibext} -o -f
$i/mesa-egl/libOpenVG.a; then
ac_cv_path_openvg_lib="-L$i/mesa-egl -lOpenVG"
break
http://git.savannah.gnu.org/cgit//commit/?id=ef00e3c89b18c50bd862e56f715d49a60e44cfa3
commit ef00e3c89b18c50bd862e56f715d49a60e44cfa3
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 15:07:48 2011 -0600
oneric moves libOpenVG into it's own directory
diff --git a/macros/openvg.m4 b/macros/openvg.m4
index 856e26b..b76ec89 100644
--- a/macros/openvg.m4
+++ b/macros/openvg.m4
@@ -88,6 +88,10 @@ AC_DEFUN([GNASH_PATH_OPENVG],
break
fi
fi
+ if test -f $i/mesa-egl/libOpenVG.${shlibext} -o -f
$i/mesa-egl/libOpenVG.a; then
+ ac_cv_path_openvg_lib="-L$i/mesa-egl -lOpenVG"
+ break
+ fi
done
dnl The Babbage board wants libgsl too. We put this in a separate
dnl vatiable because all the executables need it when statically
http://git.savannah.gnu.org/cgit//commit/?id=ce8da6f464abce2615f0ad069d53bcd24c0c64f9
commit ce8da6f464abce2615f0ad069d53bcd24c0c64f9
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 13:53:19 2011 -0600
be less verbose
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index 5920876..af80165 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -56,7 +56,7 @@ FBOvgGlue::~FBOvgGlue()
bool
FBOvgGlue::init(int argc, char **argv[])
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
#if 0
bool egl = false;
diff --git a/librender/opengl/Renderer_ogl.h b/librender/opengl/Renderer_ogl.h
index bb1b633..42cd4e8 100644
--- a/librender/opengl/Renderer_ogl.h
+++ b/librender/opengl/Renderer_ogl.h
@@ -19,7 +19,6 @@
#ifndef GNASH_RENDER_HANDLER_OGL_H
#define GNASH_RENDER_HANDLER_OGL_H
-
#if defined(NOT_SGI_GL) || defined(__APPLE_CC__)
# ifdef __APPLE_CC__
# include <AGL/agl.h>
diff --git a/librender/openvg/OpenVGRenderer.cpp
b/librender/openvg/OpenVGRenderer.cpp
index 93f8d9f..c253a6f 100644
--- a/librender/openvg/OpenVGRenderer.cpp
+++ b/librender/openvg/OpenVGRenderer.cpp
@@ -226,7 +226,7 @@ Renderer_ovg::Renderer_ovg(renderer::GnashDevice::dtype_t
/* dtype */)
_strokepaint(VG_INVALID_HANDLE),
_aspect_ratio(0.75) // 4:3 aspect ratio
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
set_scale(1.0f, 1.0f);
@@ -246,7 +246,7 @@ Renderer_ovg::Renderer_ovg(renderer::GnashDevice::dtype_t
/* dtype */)
void
Renderer_ovg::init(float x, float y)
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
_display_width = x;
_display_height = y;
@@ -322,7 +322,7 @@ Renderer_ovg::drawVideoFrame(image::GnashImage* /* frame
*/, const SWFMatrix* /*
void
Renderer_ovg::world_to_pixel(int& x, int& y, float world_x, float world_y)
const
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
// negative pixels seems ok here... we don't
// clip to valid range, use world_to_pixel(rect&)
@@ -336,7 +336,7 @@ Renderer_ovg::world_to_pixel(int& x, int& y, float world_x,
float world_y) const
geometry::Range2d<int>
Renderer_ovg::world_to_pixel(const SWFRect& wb) const
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
using namespace gnash::geometry;
@@ -354,7 +354,7 @@ Renderer_ovg::world_to_pixel(const SWFRect& wb) const
geometry::Range2d<int>
Renderer_ovg::world_to_pixel(const geometry::Range2d<float>& wb) const
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
if (wb.isNull() || wb.isWorld()) return wb;
@@ -369,7 +369,7 @@ Renderer_ovg::world_to_pixel(const
geometry::Range2d<float>& wb) const
point
Renderer_ovg::pixel_to_world(int x, int y) const
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
point p(x, y);
SWFMatrix mat = stage_matrix;
@@ -1344,7 +1344,7 @@ Renderer_ovg::drawGlyph(const SWF::ShapeRecord& rec,
const rgba& c,
void
Renderer_ovg::set_scale(float xscale, float yscale)
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
_xscale = xscale;
_yscale = yscale;
@@ -1355,7 +1355,7 @@ Renderer_ovg::set_scale(float xscale, float yscale)
void
Renderer_ovg::set_invalidated_regions(const InvalidatedRanges& /* ranges */)
{
- GNASH_REPORT_FUNCTION;
+ // GNASH_REPORT_FUNCTION;
// do nothing obviously. This method is required by the base class though,
// so something has to be here.
http://git.savannah.gnu.org/cgit//commit/?id=7a37482830606aed2b41f1428d65c10edfb59962
commit 7a37482830606aed2b41f1428d65c10edfb59962
Author: Rob Savoye <address@hidden>
Date: Tue Aug 9 13:07:14 2011 -0600
don't print Matrix debug info
diff --git a/librender/openvg/OpenVGBitmap.cpp
b/librender/openvg/OpenVGBitmap.cpp
index b9e96b3..2decb10 100644
--- a/librender/openvg/OpenVGBitmap.cpp
+++ b/librender/openvg/OpenVGBitmap.cpp
@@ -294,8 +294,7 @@ OpenVGBitmap::applyPatternBitmap(const gnash::SWFMatrix&
matrix,
// Paint the cached VG image into the VG paint surface
mat = matrix;
mat.invert();
- Renderer_ovg::printVGMatrix(matrix);
- //Renderer_ovg::printVGMatrix(mat);
+ // Renderer_ovg::printVGMatrix(matrix);
memset(vmat, 0, sizeof(vmat));
// Convert from fixed point to floating point
@@ -306,7 +305,7 @@ OpenVGBitmap::applyPatternBitmap(const gnash::SWFMatrix&
matrix,
vmat[6] = mat.tx();
vmat[7] = mat.ty();
- Renderer_ovg::printVGMatrix(vmat);
+ // Renderer_ovg::printVGMatrix(vmat);
vgSeti (VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
vgLoadMatrix (vmat);
diff --git a/librender/openvg/OpenVGRenderer.cpp
b/librender/openvg/OpenVGRenderer.cpp
index 02051e1..93f8d9f 100644
--- a/librender/openvg/OpenVGRenderer.cpp
+++ b/librender/openvg/OpenVGRenderer.cpp
@@ -96,7 +96,7 @@ public:
mat[6] = m.tx();
mat[7] = m.ty();
vgMultMatrix(mat);
- Renderer_ovg::printVGMatrix(mat);
+ // Renderer_ovg::printVGMatrix(mat);
}
~eglScopeMatrix()
@@ -623,7 +623,7 @@ Renderer_ovg::apply_mask()
mat[6] = 0; // shift tx
mat[7] = _display_height; // shift ty
vgLoadMatrix(mat);
- Renderer_ovg::printVGMatrix(mat);
+ // Renderer_ovg::printVGMatrix(mat);
#ifdef OPENVG_VERSION_1_1
vgMask(_mask_layer, VG_FILL_MASK, 0, 0, _display_width, _display_height);
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +-
configure.ac | 35 +------
cygnal/cgi-bin/oflaDemo/oflaDemo.cpp | 4 +-
cygnal/cvm.cpp | 4 -
cygnal/handler.cpp | 2 +-
extensions/mysql/mysql_db.cpp | 3 +-
gui/fb/fb_glue_ovg.cpp | 2 +-
gui/qt/Qt4Glue.cpp | 3 +
gui/qt/Qt4Glue.h | 1 +
gui/sdl/sdl_agg_glue.cpp | 2 +-
libbase/ImageIterators.h | 2 +-
libbase/Range2d.h | 96 ++++++++---------
libbase/SharedMem.cpp | 4 +-
libbase/extension.cpp | 22 +---
libbase/sharedlib.cpp | 21 ----
libbase/sharedlib.h | 4 +-
libbase/snappingrange.h | 2 +-
libcore/FillStyle.cpp | 67 +++++++++++-
libcore/FillStyle.h | 13 +++
libcore/MovieClip.cpp | 4 +
libcore/SWFStream.cpp | 6 +-
libcore/Shape.cpp | 3 +-
libcore/asobj/Sound_as.cpp | 7 +-
libcore/parser/TypesParser.cpp | 2 +-
libcore/swf/DefineBitsTag.cpp | 6 +-
libcore/swf/DefineShapeTag.h | 2 -
libcore/swf/ShapeRecord.cpp | 25 +++--
libdevice/rawfb/test_rawfb.cpp | 1 -
libmedia/VideoConverter.h | 3 +-
libmedia/ffmpeg/VideoConverterFfmpeg.cpp | 2 +-
libmedia/gst/VideoDecoderGst.cpp | 4 +
librender/opengl/Renderer_ogl.h | 1 -
librender/opengles1/Renderer_gles1.cpp | 40 ++++---
librender/openvg/OpenVGBitmap.cpp | 5 +-
librender/openvg/OpenVGRenderer.cpp | 20 ++--
librender/openvg/OpenVGStyle.h | 114 ++++++++++++++++++++
libsound/aos4/sound_handler_ahi.cpp | 8 +-
libsound/sdl/sound_handler_sdl.cpp | 7 ++
libsound/sdl/sound_handler_sdl.h | 3 +
libsound/sound_handler.cpp | 17 +++
libsound/sound_handler.h | 4 +
macros/openvg.m4 | 9 ++-
plugin/npapi/plugin.cpp | 12 +--
testsuite/MovieTester.cpp | 2 +-
testsuite/misc-ming.all/RemoveObject2Test.c | 5 +-
testsuite/misc-ming.all/loop/simple_loop_test.c | 12 +--
.../misc-ming.all/sound/StreamSoundTestRunner.cpp | 2 -
testsuite/misc-swfc.all/Makefile.am | 17 +++
testsuite/misc-swfc.all/sound_stop.sc | 60 ++++++++++
.../sound_stop_runner.cpp} | 53 ++++-----
utilities/flvdumper.cpp | 8 +-
51 files changed, 490 insertions(+), 264 deletions(-)
create mode 100644 testsuite/misc-swfc.all/sound_stop.sc
copy testsuite/{misc-swfmill.all/missing_bitmapTestRunner.cpp =>
misc-swfc.all/sound_stop_runner.cpp} (51%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-1138-gc0d7d7a,
Rob Savoye <=