[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1244-g2691547 |
Date: |
Wed, 30 Nov 2011 16:08:42 +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, master has been updated
via 2691547e2df1debdcb2710a176666c67091acde7 (commit)
from 65a6658a468e80d8cde1b96e96a5002dd750567f (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=2691547e2df1debdcb2710a176666c67091acde7
commit 2691547e2df1debdcb2710a176666c67091acde7
Author: Rob Savoye <address@hidden>
Date: Wed Nov 30 09:07:39 2011 -0700
Cleanup compilation warnings when using -pedantic for #34911
diff --git a/librender/openvg/OpenVGBitmap.cpp
b/librender/openvg/OpenVGBitmap.cpp
index 061b068..bc905e0 100644
--- a/librender/openvg/OpenVGBitmap.cpp
+++ b/librender/openvg/OpenVGBitmap.cpp
@@ -170,7 +170,8 @@ OpenVGBitmap::createRadialBitmap(float cx, float cy, float
fx, float fy,
// Color Ramp is the same as for linear gradient
size_t entries = records.size() * 5;
- VGfloat ramps[entries];
+ boost::scoped_array<VGfloat> ramps(new VGfloat[entries]);
+
int j = 0;
for (size_t i=0; i!= records.size(); ++i) {
std::cerr << "The record is: " << records[i].ratio/255.0f
@@ -185,7 +186,7 @@ OpenVGBitmap::createRadialBitmap(float cx, float cy, float
fx, float fy,
ramps[j++] = c.m_b / 255.0f;
ramps[j++] = c.m_a / 255.0f;
}
- vgSetParameterfv(paint, VG_PAINT_COLOR_RAMP_STOPS, entries, ramps);
+ vgSetParameterfv(paint, VG_PAINT_COLOR_RAMP_STOPS, entries, ramps.get());
return this;
}
@@ -234,7 +235,7 @@ OpenVGBitmap::createLinearBitmap(float x0, float y0, float
x1, float y1,
// function will generate an error if the number of values
// submitted is not a multiple of 5 (zero is acceptable)
size_t entries = records.size() * 5;
- VGfloat ramps[entries];
+ boost::scoped_array<VGfloat> ramps(new VGfloat[entries]);
int j = 0;
for (size_t i=0; i!= records.size(); ++i) {
std::cerr << "The record ratio is: " << records[i].ratio/255.0f;
@@ -249,7 +250,7 @@ OpenVGBitmap::createLinearBitmap(float x0, float y0, float
x1, float y1,
ramps[j++] = c.m_a / 255.0f;
}
#if 1
- vgSetParameterfv(paint, VG_PAINT_COLOR_RAMP_STOPS, entries, ramps);
+ vgSetParameterfv(paint, VG_PAINT_COLOR_RAMP_STOPS, entries, ramps.get());
#else
VGfloat rampStop[] = {0.00f, 1.0f, 1.0f, 1.0f, 1.0f,
0.33f, 1.0f, 0.0f, 0.0f, 1.0f,
diff --git a/librender/openvg/OpenVGRenderer.cpp
b/librender/openvg/OpenVGRenderer.cpp
index adf4b5a..cd3fa78 100644
--- a/librender/openvg/OpenVGRenderer.cpp
+++ b/librender/openvg/OpenVGRenderer.cpp
@@ -375,7 +375,7 @@ Renderer_ovg::pixel_to_world(int x, int y) const
SWFMatrix mat = stage_matrix;
mat.invert().transform(p);
return p;
-};
+}
/// Setup the renderer to display by setting the Matrix for scaling,
/// shearing, and transformations.
-----------------------------------------------------------------------
Summary of changes:
librender/openvg/OpenVGBitmap.cpp | 9 +++++----
librender/openvg/OpenVGRenderer.cpp | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1244-g2691547,
Rob Savoye <=