[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/grid_index.h libbase/image_filter...
|
From: |
Jim Garrison |
|
Subject: |
[Gnash-commit] gnash libbase/grid_index.h libbase/image_filter... |
|
Date: |
Sat, 25 Feb 2006 03:15:52 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Jim Garrison <address@hidden> 06/02/25 03:15:51
Modified files:
libbase : grid_index.h image_filters.cpp
triangulate_impl.h
. : ChangeLog
backend : sound_handler_sdl.cpp
libgeometry : kd_tree_dynamic.cpp tqt.cpp
plugin : plugin.cpp
server : Movie.cpp Sprite.cpp action.cpp button.cpp
dlist.cpp font.cpp fontlib.cpp impl.cpp
morph2.cpp shape.cpp styles.cpp tesselate.cpp
text.cpp xmlnode.cpp xmlsocket.cpp
Log message:
2006-02-24 Jim Garrison <address@hidden>
* backend/sound_handler_sdl.cpp: fixed int, unsigned int comparisions
* libbase/grid_index.h: fixed int, unsigned int comparisions
* libbase/image_filters.cpp: fixed int, unsigned int comparisions
* libbase/triangulate_impl.h: fixed int, unsigned int comparisions
* libgeometry/kd_tree_dynamic.cpp: fixed int, unsigned int comparisions
* libgeometry/tqt.cpp: fixed int, unsigned int comparisions
* plugin/plugin.cpp: fixed int, unsigned int comparisions
* server/Movie.cpp: fixed int, unsigned int comparisions
* server/Sprite.cpp: fixed int, unsigned int comparisions
* server/action.cpp: fixed int, unsigned int comparisions
* server/button.cpp: fixed int, unsigned int comparisions
* server/dlist.cpp: fixed int, unsigned int comparisions
* server/font.cpp: fixed int, unsigned int comparisions
* server/fontlib.cpp: fixed int, unsigned int comparisions
* server/impl.cpp: fixed int, unsigned int comparisions
* server/morph2.cpp: fixed int, unsigned int comparisions
* server/shape.cpp: fixed int, unsigned int comparisions
* server/styles.cpp: fixed int, unsigned int comparisions
* server/tesselate.cpp: fixed int, unsigned int comparisions
* server/text.cpp: fixed int, unsigned int comparisions
* server/xmlnode.cpp: fixed int, unsigned int comparisions
* server/xmlsocket.cpp: fixed int, unsigned int comparisions
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/grid_index.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/image_filters.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/triangulate_impl.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/sound_handler_sdl.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/kd_tree_dynamic.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/tqt.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Movie.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/button.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/dlist.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/font.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/fontlib.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/morph2.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/styles.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/tesselate.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.154 gnash/ChangeLog:1.155
--- gnash/ChangeLog:1.154 Fri Feb 24 02:48:15 2006
+++ gnash/ChangeLog Sat Feb 25 03:15:51 2006
@@ -1,3 +1,28 @@
+2006-02-24 Jim Garrison <address@hidden>
+
+ * backend/sound_handler_sdl.cpp: fixed int, unsigned int comparisions
+ * libbase/grid_index.h: fixed int, unsigned int comparisions
+ * libbase/image_filters.cpp: fixed int, unsigned int comparisions
+ * libbase/triangulate_impl.h: fixed int, unsigned int comparisions
+ * libgeometry/kd_tree_dynamic.cpp: fixed int, unsigned int comparisions
+ * libgeometry/tqt.cpp: fixed int, unsigned int comparisions
+ * plugin/plugin.cpp: fixed int, unsigned int comparisions
+ * server/Movie.cpp: fixed int, unsigned int comparisions
+ * server/Sprite.cpp: fixed int, unsigned int comparisions
+ * server/action.cpp: fixed int, unsigned int comparisions
+ * server/button.cpp: fixed int, unsigned int comparisions
+ * server/dlist.cpp: fixed int, unsigned int comparisions
+ * server/font.cpp: fixed int, unsigned int comparisions
+ * server/fontlib.cpp: fixed int, unsigned int comparisions
+ * server/impl.cpp: fixed int, unsigned int comparisions
+ * server/morph2.cpp: fixed int, unsigned int comparisions
+ * server/shape.cpp: fixed int, unsigned int comparisions
+ * server/styles.cpp: fixed int, unsigned int comparisions
+ * server/tesselate.cpp: fixed int, unsigned int comparisions
+ * server/text.cpp: fixed int, unsigned int comparisions
+ * server/xmlnode.cpp: fixed int, unsigned int comparisions
+ * server/xmlsocket.cpp: fixed int, unsigned int comparisions
+
2006-02-23 Rob Savoye <address@hidden>
* doc/C/sources.html: Add section on cross compiling Gnash.
Index: gnash/backend/sound_handler_sdl.cpp
diff -u gnash/backend/sound_handler_sdl.cpp:1.4
gnash/backend/sound_handler_sdl.cpp:1.5
--- gnash/backend/sound_handler_sdl.cpp:1.4 Wed Feb 1 23:58:32 2006
+++ gnash/backend/sound_handler_sdl.cpp Sat Feb 25 03:15:51 2006
@@ -170,7 +170,7 @@
virtual void play_sound(int sound_handle, int loop_count /* other
params */)
// Play the index'd sample.
{
- if (sound_handle >= 0 && sound_handle < m_samples.size())
+ if (sound_handle >= 0 && sound_handle < (int) m_samples.size())
{
if (m_samples[sound_handle])
{
@@ -183,7 +183,7 @@
virtual void stop_sound(int sound_handle)
{
- if (sound_handle < 0 || sound_handle >= m_samples.size())
+ if (sound_handle < 0 || sound_handle >= (int) m_samples.size())
{
// Invalid handle.
return;
@@ -205,7 +205,7 @@
virtual void delete_sound(int sound_handle)
// this gets called this when it's done with a sample.
{
- if (sound_handle >= 0 && sound_handle < m_samples.size())
+ if (sound_handle >= 0 && sound_handle < (int) m_samples.size())
{
Mix_Chunk* chunk = m_samples[sound_handle];
if (chunk)
Index: gnash/libbase/grid_index.h
diff -u gnash/libbase/grid_index.h:1.2 gnash/libbase/grid_index.h:1.3
--- gnash/libbase/grid_index.h:1.2 Sun Feb 12 02:12:07 2006
+++ gnash/libbase/grid_index.h Sat Feb 25 03:15:51 2006
@@ -528,7 +528,7 @@
int query_id = m_index->get_query_id();
array<grid_entry_t*>* cell_array =
m_index->get_cell(m_current_cell_x, m_current_cell_y);
- while (++m_current_cell_array_index <
cell_array->size())
+ while (++m_current_cell_array_index < (int)
cell_array->size())
{
// Continue through the current cell.
m_current_entry =
(*cell_array)[m_current_cell_array_index];
Index: gnash/libbase/image_filters.cpp
diff -u gnash/libbase/image_filters.cpp:1.1 gnash/libbase/image_filters.cpp:1.2
--- gnash/libbase/image_filters.cpp:1.1 Tue Dec 20 20:57:00 2005
+++ gnash/libbase/image_filters.cpp Sat Feb 25 03:15:51 2006
@@ -388,7 +388,8 @@
image::rgb* tmp; /* intermediate image */
float xscale, yscale; /* zoom scale factors */
- int i, j, k; /* loop variables */
+ int i, k; /* loop variables */
+ unsigned int j; /* loop variables */
int n; /* pixel number */
float center; int left, right; /* filter calculation variables */
float width, fscale, weight; /* filter calculation variables */
@@ -429,10 +430,10 @@
center = (float) i / xscale;
left = int(ceilf(center - width));
right = int(floorf(center + width));
- for (j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for (k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight / fscale) /
fscale;
- n = iclamp(j, 0, in_window_w - 1);
+ n = iclamp(k, 0, in_window_w - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -442,10 +443,10 @@
center = (float) i / xscale;
left = int(ceilf(center - support));
right = int(floorf(center + support));
- for(j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for(k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight);
- n = iclamp(j, 0, in_window_w - 1);
+ n = iclamp(k, 0, in_window_w - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -481,10 +482,10 @@
center = (float) i / yscale;
left = int(ceilf(center - width));
right = int(floorf(center + width));
- for (j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for (k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight / fscale) /
fscale;
- n = iclamp(j, 0, tmp->m_height - 1);
+ n = iclamp(k, 0, tmp->m_height - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -494,10 +495,10 @@
center = (float) i / yscale;
left = int(ceilf(center - support));
right = int(floorf(center + support));
- for(j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for(k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight);
- n = iclamp(j, 0, tmp->m_height - 1);
+ n = iclamp(k, 0, tmp->m_height - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -553,7 +554,8 @@
image::rgba* tmp; /* intermediate image */
float xscale, yscale; /* zoom scale factors */
- int i, j, k; /* loop variables */
+ int i, k; /* loop variables */
+ unsigned int j; /* loop variables */
int n; /* pixel number */
float center; int left, right; /* filter calculation variables */
float width, fscale, weight; /* filter calculation variables */
@@ -594,10 +596,10 @@
center = (float) i / xscale;
left = int(ceilf(center - width));
right = int(floorf(center + width));
- for (j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for (k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight / fscale) /
fscale;
- n = iclamp(j, 0, in_window_w - 1);
+ n = iclamp(k, 0, in_window_w - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -607,10 +609,10 @@
center = (float) i / xscale;
left = int(ceilf(center - support));
right = int(floorf(center + support));
- for(j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for(k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight);
- n = iclamp(j, 0, in_window_w - 1);
+ n = iclamp(k, 0, in_window_w - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -648,10 +650,10 @@
center = (float) i / yscale;
left = int(ceilf(center - width));
right = int(floorf(center + width));
- for (j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for (k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight / fscale) /
fscale;
- n = iclamp(j, 0, tmp->m_height - 1);
+ n = iclamp(k, 0, tmp->m_height - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
@@ -661,10 +663,10 @@
center = (float) i / yscale;
left = int(ceilf(center - support));
right = int(floorf(center + support));
- for(j = left; j <= right; ++j) {
- weight = center - (float) j;
+ for(k = left; k <= right; ++k) {
+ weight = center - (float) k;
weight = (*filter_function)(weight);
- n = iclamp(j, 0, tmp->m_height - 1);
+ n = iclamp(k, 0, tmp->m_height - 1);
contrib[i].push_back(CONTRIB(n, weight));
}
}
Index: gnash/libbase/triangulate_impl.h
diff -u gnash/libbase/triangulate_impl.h:1.5
gnash/libbase/triangulate_impl.h:1.6
--- gnash/libbase/triangulate_impl.h:1.5 Sun Feb 12 02:12:07 2006
+++ gnash/libbase/triangulate_impl.h Sat Feb 25 03:15:51 2006
@@ -636,7 +636,7 @@
void poly<coord_t>::append_vert(array<vert_t>* sorted_verts, int vert_index)
// Link the specified vert into our loop.
{
- assert(vert_index >= 0 && vert_index < sorted_verts->size());
+ assert(vert_index >= 0 && vert_index < (int) sorted_verts->size());
assert(is_valid(*sorted_verts, false /* don't check for consecutive
dupes, poly is not finished */));
m_vertex_count++;
@@ -695,7 +695,7 @@
// Walk forward to include all coincident but later verts!
int vi = v1;
- while ((vi + 1) < sorted_verts.size() && sorted_verts[vi + 1].m_v ==
pv1->m_v)
+ while ((vi + 1) < (int) sorted_verts.size() && sorted_verts[vi + 1].m_v
== pv1->m_v)
{
vi++;
}
Index: gnash/libgeometry/kd_tree_dynamic.cpp
diff -u gnash/libgeometry/kd_tree_dynamic.cpp:1.2
gnash/libgeometry/kd_tree_dynamic.cpp:1.3
--- gnash/libgeometry/kd_tree_dynamic.cpp:1.2 Wed Feb 1 23:58:32 2006
+++ gnash/libgeometry/kd_tree_dynamic.cpp Sat Feb 25 03:15:51 2006
@@ -199,7 +199,7 @@
longest_axis,
offset);
- if (verts0.size() >= vert_count || verts1.size() >= vert_count)
+ if ((int) verts0.size() >= vert_count || (int) verts1.size() >=
vert_count)
{
// Trouble: couldn't reduce vert count by
// splitting.
@@ -1091,7 +1091,7 @@
inf->m_max_depth = inf->m_depth;
}
- while (inf->m_width.size() <= inf->m_max_depth)
+ while ((int) inf->m_width.size() <= inf->m_max_depth)
{
inf->m_width.push_back(0);
}
@@ -1168,7 +1168,7 @@
node_traverse(&inf, m_root);
- while (inf.m_count.size() <= inf.m_max_depth)
+ while ((int) inf.m_count.size() <= inf.m_max_depth)
{
inf.m_count.push_back(0);
}
Index: gnash/libgeometry/tqt.cpp
diff -u gnash/libgeometry/tqt.cpp:1.2 gnash/libgeometry/tqt.cpp:1.3
--- gnash/libgeometry/tqt.cpp:1.2 Wed Feb 1 23:58:32 2006
+++ gnash/libgeometry/tqt.cpp Sat Feb 25 03:15:51 2006
@@ -105,7 +105,7 @@
assert(level < m_depth);
int index = node_index(level, col, row);
- assert(index < m_toc.size());
+ assert(index < (int) m_toc.size());
// Load the .jpg and make a texture from it.
m_source->set_position(m_toc[index]);
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.12 gnash/plugin/plugin.cpp:1.13
--- gnash/plugin/plugin.cpp:1.12 Sun Feb 5 22:17:49 2006
+++ gnash/plugin/plugin.cpp Sat Feb 25 03:15:51 2006
@@ -408,7 +408,7 @@
memset(tmp, 0, 300);
string url = stream->url;
string fname, opts;
- int start, end, eq;
+ string::size_type start, end, eq;
bool dumpopts = false;
end = url.find(".swf", 0) + 4;
Index: gnash/server/Movie.cpp
diff -u gnash/server/Movie.cpp:1.5 gnash/server/Movie.cpp:1.6
--- gnash/server/Movie.cpp:1.5 Sun Feb 12 02:12:07 2006
+++ gnash/server/Movie.cpp Sat Feb 25 03:15:51 2006
@@ -411,7 +411,7 @@
int id = it->first;
// Insert in correct place.
- int insert;
+ unsigned int insert;
for (insert = 0; insert < font_ids.size(); insert++)
{
if (font_ids[insert] > id)
@@ -651,7 +651,6 @@
void movie_root::advance(float delta_time)
{
// printf("%s:\n", __PRETTY_FUNCTION__); // FIXME:
- int i;
if (m_on_event_load_called == false)
{
// Must do loading events. For child sprites this is
@@ -677,7 +676,7 @@
}
#endif
if (m_interval_timers.size() > 0) {
- for (i=0; i<m_interval_timers.size(); i++) {
+ for (unsigned int i=0; i<m_interval_timers.size(); i++) {
if (m_interval_timers[i]->expired()) {
// printf("FIXME: Interval Timer Expired!\n");
//m_movie->on_event_interval_timer();
Index: gnash/server/Sprite.cpp
diff -u gnash/server/Sprite.cpp:1.12 gnash/server/Sprite.cpp:1.13
--- gnash/server/Sprite.cpp:1.12 Mon Feb 13 10:44:12 2006
+++ gnash/server/Sprite.cpp Sat Feb 25 03:15:51 2006
@@ -1065,7 +1065,7 @@
if (init_actions && init_actions->size() > 0)
{
// Need to execute these actions.
- for (int i= 0; i < init_actions->size(); i++)
+ for (unsigned int i= 0; i < init_actions->size();
i++)
{
execute_tag* e = (*init_actions)[i];
e->execute(this);
@@ -1078,7 +1078,7 @@
}
const array<execute_tag*>& playlist = m_def->get_playlist(frame);
- for (int i = 0; i < playlist.size(); i++)
+ for (unsigned int i = 0; i < playlist.size(); i++)
{
execute_tag* e = playlist[i];
if (state_only)
@@ -1101,7 +1101,7 @@
assert(frame < m_def->get_frame_count());
const array<execute_tag*>& playlist = m_def->get_playlist(frame);
- for (int i = 0; i < playlist.size(); i++)
+ for (unsigned int i = 0; i < playlist.size(); i++)
{
execute_tag* e = playlist[i];
e->execute_state_reverse(this, frame);
@@ -1114,7 +1114,7 @@
assert(frame < m_def->get_frame_count());
const array<execute_tag*>& playlist =
m_def->get_playlist(frame);
- for (int i = 0; i < playlist.size(); i++)
+ for (unsigned int i = 0; i < playlist.size(); i++)
{
execute_tag* e = playlist[i];
if (e->is_remove_tag())
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.49 gnash/server/action.cpp:1.50
--- gnash/server/action.cpp:1.49 Tue Feb 14 17:49:58 2006
+++ gnash/server/action.cpp Sat Feb 25 03:15:51 2006
@@ -1673,13 +1673,13 @@
// cache the results. If we ever hit a different decl_dict in
// the same action_buffer, then we log an error and ignore it.
{
- assert(stop_pc <= m_buffer.size());
+ assert(stop_pc <= (int) m_buffer.size());
if (m_decl_dict_processed_at == start_pc)
{
// We've already processed this decl_dict.
int count = m_buffer[start_pc + 3] |
(m_buffer[start_pc + 4] << 8);
- assert(m_dictionary.size() == count);
+ assert((int) m_dictionary.size() == count);
UNUSED(count);
return;
}
@@ -3251,7 +3251,7 @@
{
int id = m_buffer[3
+ i];
i++;
- if (id <
m_dictionary.size())
+ if (id < (int)
m_dictionary.size())
{
env->push(m_dictionary[id]);
@@ -3268,7 +3268,7 @@
{
int id = m_buffer[3
+ i] | (m_buffer[4 + i] << 8);
i += 2;
- if (id <
m_dictionary.size())
+ if (id < (int)
m_dictionary.size())
{
env->push(m_dictionary[id]);
IF_VERBOSE_ACTION(log_msg("-------------- pushed '%s'\n", m_dictionary[id]));
@@ -4125,7 +4125,7 @@
// array, so we don't have to keep base/frame
// pointers.
- if (reg <= 0 || reg > m_local_register.size())
+ if (reg <= 0 || reg > (int) m_local_register.size())
{
log_error("Invalid local register %d, stack only has %d
entries\n",
reg, m_local_register.size());
Index: gnash/server/button.cpp
diff -u gnash/server/button.cpp:1.3 gnash/server/button.cpp:1.4
--- gnash/server/button.cpp:1.3 Sat Feb 11 01:57:03 2006
+++ gnash/server/button.cpp Sat Feb 25 03:15:51 2006
@@ -355,7 +355,7 @@
matrix mat = get_world_matrix();
// Advance our relevant characters.
- {for (int i = 0; i < m_def->m_button_records.size();
i++)
+ {for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
button_record& rec =
m_def->m_button_records[i];
if (m_record_character[i] == NULL)
@@ -382,7 +382,7 @@
{
// printf("%s(%d): ", __PRETTY_FUNCTION__, __LINE__);
- for (int i = 0; i < m_def->m_button_records.size(); i++)
+ for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
button_record& rec =
m_def->m_button_records[i];
if (m_record_character[i] == NULL)
@@ -419,7 +419,7 @@
point p;
m.transform_by_inverse(&p, point(x, y));
- {for (int i = 0; i < m_def->m_button_records.size();
i++)
+ {for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
button_record& rec =
m_def->m_button_records[i];
if (rec.m_character_id < 0 || rec.m_hit_test ==
false)
@@ -532,12 +532,12 @@
restart_characters(c);
// Add appropriate actions to the movie's execute
list...
- {for (int i = 0; i < m_def->m_button_actions.size();
i++)
+ {for (unsigned int i = 0; i <
m_def->m_button_actions.size(); i++)
{
if (m_def->m_button_actions[i].m_conditions & c)
{
// Matching action.
- for (int j = 0; j <
m_def->m_button_actions[i].m_actions.size(); j++)
+ for (unsigned int j = 0; j <
m_def->m_button_actions[i].m_actions.size(); j++)
{
get_parent()->add_action_buffer(m_def->m_button_actions[i].m_actions[j]);
}
@@ -552,7 +552,7 @@
void restart_characters(int condition)
{
// Restart our relevant characters
- for (int i = 0; i < m_def->m_button_records.size(); i++)
+ for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
bool restart = false;
button_record* rec =
&m_def->m_button_records[i];
@@ -722,7 +722,7 @@
}
case M_WIDTH: // _width
{
- for (int i = 0; i <
m_def->m_button_records.size(); i++)
+ for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
button_record& rec =
m_def->m_button_records[i];
if (m_record_character[i] == NULL)
@@ -745,7 +745,7 @@
}
case M_HEIGHT: // _height
{
- for (int i = 0; i <
m_def->m_button_records.size(); i++)
+ for (unsigned int i = 0; i <
m_def->m_button_records.size(); i++)
{
button_record& rec =
m_def->m_button_records[i];
if (m_record_character[i] == NULL)
Index: gnash/server/dlist.cpp
diff -u gnash/server/dlist.cpp:1.4 gnash/server/dlist.cpp:1.5
--- gnash/server/dlist.cpp:1.4 Sun Feb 12 02:12:07 2006
+++ gnash/server/dlist.cpp Sat Feb 25 03:15:51 2006
@@ -100,7 +100,7 @@
// Like the above, but looks for an exact match, and returns -1
if failed.
{
int index = find_display_index(depth);
- if (index >= m_display_object_array.size()
+ if (index >= (int) m_display_object_array.size()
|| get_display_object(index).m_character->get_depth()
!= depth)
{
// No object at that depth.
@@ -493,7 +493,7 @@
// * ???
//
// Need to test to see what Flash does.
- if (n != m_display_object_array.size())
+ if (n != (int) m_display_object_array.size())
{
log_error("gnash bug: dlist size changed due to
character actions, bailing on update!\n");
break;
@@ -524,7 +524,7 @@
//log_msg("number of objects to be drawn %i\n",
m_display_object_array.size());
- for (int i = 0; i < m_display_object_array.size(); i++)
+ for (unsigned int i = 0; i < m_display_object_array.size(); i++)
{
display_object_info& dobj =
m_display_object_array[i];
Index: gnash/server/font.cpp
diff -u gnash/server/font.cpp:1.3 gnash/server/font.cpp:1.4
--- gnash/server/font.cpp:1.3 Sun Feb 12 02:12:07 2006
+++ gnash/server/font.cpp Sat Feb 25 03:15:51 2006
@@ -45,7 +45,7 @@
shape_character_def* font::get_glyph(int index) const
{
- if (index >= 0 && index < m_glyphs.size())
+ if (index >= 0 && index < (int) m_glyphs.size())
{
return m_glyphs[index].get_ptr();
}
@@ -60,7 +60,7 @@
// Return a pointer to a texture_glyph struct corresponding to
// the given glyph_index, if we have one. Otherwise return NULL.
{
- if (glyph_index < 0 || glyph_index >= m_texture_glyphs.size())
+ if (glyph_index < 0 || glyph_index >= (int)
m_texture_glyphs.size())
{
static const texture_glyph s_dummy_texture_glyph;
return s_dummy_texture_glyph;
@@ -75,7 +75,7 @@
// index. The texture_glyph can be used later to render the
// glyph.
{
- assert(glyph_index >= 0 && glyph_index < m_glyphs.size());
+ assert(glyph_index >= 0 && glyph_index < (int) m_glyphs.size());
assert(m_texture_glyphs.size() == m_glyphs.size());
assert(glyph.is_renderable());
@@ -327,7 +327,7 @@
if (m_wide_codes)
{
// Code table is made of Uint16's.
- for (int i = 0; i < m_glyphs.size(); i++)
+ for (unsigned int i = 0; i < m_glyphs.size(); i++)
{
m_code_table.add(in->read_u16(), i);
}
@@ -335,7 +335,7 @@
else
{
// Code table is made of bytes.
- for (int i = 0; i < m_glyphs.size(); i++)
+ for (unsigned int i = 0; i < m_glyphs.size(); i++)
{
m_code_table.add(in->read_u8(), i);
}
@@ -372,7 +372,7 @@
return 0;
}
- if (glyph_index < m_advance_table.size())
+ if (glyph_index < (int) m_advance_table.size())
{
assert(glyph_index >= 0);
return m_advance_table[glyph_index];
Index: gnash/server/fontlib.cpp
diff -u gnash/server/fontlib.cpp:1.2 gnash/server/fontlib.cpp:1.3
--- gnash/server/fontlib.cpp:1.2 Sun Feb 12 02:12:07 2006
+++ gnash/server/fontlib.cpp Sat Feb 25 03:15:51 2006
@@ -329,7 +329,7 @@
{
s_covered_rects.push_back(r);
- for (int i = 0; i < s_anchor_points.size(); i++)
+ for (unsigned int i = 0; i < s_anchor_points.size(); i++)
{
const pointi& p = s_anchor_points[i];
if (r.contains(p.m_x, p.m_y))
@@ -945,7 +945,7 @@
// Build the glyph images.
array<rendered_glyph_info> glyph_info;
- for (int i = 0; i < fonts.size(); i++)
+ for (unsigned int i = 0; i < fonts.size(); i++)
{
generate_font_bitmaps(&glyph_info, fonts[i], owner);
}
@@ -1017,7 +1017,7 @@
out->write_le16(fonts.size());
// for each font:
- for (int f = 0; f < fonts.size(); f++)
+ for (unsigned int f = 0; f < fonts.size(); f++)
{
font* fnt = fonts[f];
@@ -1138,7 +1138,7 @@
// load number of fonts.
int nf = in->read_le16();
- if (nf != fonts.size())
+ if (nf != (int) fonts.size())
{
// Font counts must match!
log_error("error: mismatched font count (read %d,
expected %d) in cached font data\n", nf, fonts.size());
@@ -1238,7 +1238,7 @@
font* get_font(int index)
// Retrieve one of our fonts, by index.
{
- if (index < 0 || index >= s_fonts.size())
+ if (index < 0 || index >= (int) s_fonts.size())
{
return NULL;
}
@@ -1251,7 +1251,7 @@
// Return the named font.
{
// Dumb linear search.
- for (int i = 0; i < s_fonts.size(); i++)
+ for (unsigned int i = 0; i < s_fonts.size(); i++)
{
font* f = s_fonts[i].get_ptr();
if (f != NULL)
@@ -1285,7 +1285,7 @@
#ifndef NDEBUG
// Make sure font isn't already in the list.
- for (int i = 0; i < s_fonts.size(); i++)
+ for (unsigned int i = 0; i < s_fonts.size(); i++)
{
assert(s_fonts[i] != f);
}
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.18 gnash/server/impl.cpp:1.19
--- gnash/server/impl.cpp:1.18 Wed Feb 15 13:53:27 2006
+++ gnash/server/impl.cpp Sat Feb 25 03:15:51 2006
@@ -537,7 +537,7 @@
//#if 0
void delete_unused_root()
{
- for (int i = 0; i < s_extern_sprites.size(); i++)
+ for (unsigned int i = 0; i < s_extern_sprites.size(); i++)
{
movie_interface* root_m = s_extern_sprites[i];
movie* m = root_m->get_root_movie();
Index: gnash/server/morph2.cpp
diff -u gnash/server/morph2.cpp:1.2 gnash/server/morph2.cpp:1.3
--- gnash/server/morph2.cpp:1.2 Sat Feb 11 01:57:03 2006
+++ gnash/server/morph2.cpp Sat Feb 25 03:15:51 2006
@@ -29,7 +29,7 @@
{
// printf("%s(%d): ", __PRETTY_FUNCTION__, __LINE__);
- int i;
+ unsigned int i;
float ratio = inst->m_ratio;
// bounds
@@ -59,7 +59,7 @@
}
// shape
- int k=0, n=0;
+ unsigned int k=0, n=0;
for (i=0; i < m_paths.size(); i++)
{
path& p = m_paths[i];
@@ -83,7 +83,7 @@
int len = p1.m_edges.size();
p.m_edges.resize(len);
- for (int j=0; j < p.m_edges.size(); j++)
+ for (unsigned int j=0; j < p.m_edges.size(); j++)
{
p.m_edges[j].m_cx = flerp(p1.m_edges[j].m_cx,
m_shape2->get_paths()[n].m_edges[k].m_cx, ratio);
p.m_edges[j].m_cy = flerp(p1.m_edges[j].m_cy,
m_shape2->get_paths()[n].m_edges[k].m_cy, ratio);
@@ -238,29 +238,30 @@
// setup array size
m_fill_styles.resize(m_shape1->m_fill_styles.size());
- for (i = 0; i < m_fill_styles.size(); i++)
+ unsigned int k;
+ for (k = 0; k < m_fill_styles.size(); k++)
{
- fill_style& fs = m_fill_styles[i];
- fill_style& fs1 = m_shape1->m_fill_styles[i];
+ fill_style& fs = m_fill_styles[k];
+ fill_style& fs1 = m_shape1->m_fill_styles[k];
fs.m_gradients.resize(fs1.m_gradients.size());
}
m_line_styles.resize(m_shape1->m_line_styles.size());
m_paths.resize(m_shape1->m_paths.size());
int edges_count1 = 0;
- for (i = 0; i < m_paths.size(); i++)
+ for (k = 0; k < m_paths.size(); k++)
{
- path& p = m_paths[i];
- path& p1 = m_shape1->m_paths[i];
+ path& p = m_paths[k];
+ path& p1 = m_shape1->m_paths[k];
int len = p1.m_edges.size();
edges_count1 += len;
p.m_edges.resize(len);
}
int edges_count2 = 0;
- for (i = 0; i < m_shape2->m_paths.size(); i++)
+ for (k = 0; k < m_shape2->m_paths.size(); k++)
{
- path& p2 = m_shape2->m_paths[i];
+ path& p2 = m_shape2->m_paths[k];
int len = p2.m_edges.size();
edges_count2 += len;
}
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.6 gnash/server/shape.cpp:1.7
--- gnash/server/shape.cpp:1.6 Wed Feb 15 23:35:53 2006
+++ gnash/server/shape.cpp Sat Feb 25 03:15:51 2006
@@ -721,7 +721,7 @@
assert(style < 10000); // sanity check
// Expand our mesh list if necessary.
- if (style >= m_meshes.size())
+ if (style >= (int) m_meshes.size())
{
m_meshes.resize(style + 1);
}
Index: gnash/server/styles.cpp
diff -u gnash/server/styles.cpp:1.4 gnash/server/styles.cpp:1.5
--- gnash/server/styles.cpp:1.4 Mon Jan 23 17:21:25 2006
+++ gnash/server/styles.cpp Sat Feb 25 03:15:51 2006
@@ -160,7 +160,7 @@
if (ratio < m_gradients[0].m_ratio)
return m_gradients[0].m_color;
- for (int i = 1; i < m_gradients.size(); i++)
+ for (unsigned int i = 1; i < m_gradients.size(); i++)
{
if (m_gradients[i].m_ratio >= ratio)
{
@@ -309,7 +309,7 @@
// fill style gradients
assert(m_gradients.size() == a.m_gradients.size());
assert(m_gradients.size() == b.m_gradients.size());
- for (int j=0; j < m_gradients.size(); j++)
+ for (unsigned int j=0; j < m_gradients.size(); j++)
{
m_gradients[j].m_ratio =
(Uint8) frnd(
Index: gnash/server/tesselate.cpp
diff -u gnash/server/tesselate.cpp:1.3 gnash/server/tesselate.cpp:1.4
--- gnash/server/tesselate.cpp:1.3 Sun Feb 12 02:12:07 2006
+++ gnash/server/tesselate.cpp Sat Feb 25 03:15:51 2006
@@ -274,11 +274,11 @@
sizeof(s_current_segments[0]),
compare_segment_y);
- int base = 0;
+ unsigned int base = 0;
while (base < s_current_segments.size())
{
- float ytop =
s_current_segments[base].m_begin.m_y;
- int next_base = base + 1;
+ float ytop =
s_current_segments[base].m_begin.m_y;
+ unsigned int next_base = base + 1;
for (;;)
{
if (next_base ==
s_current_segments.size()
@@ -376,7 +376,7 @@
&& slab[0].m_right_style >= 0)
{
// Reverse sense of polygon fill! Right fill style is
in charge.
- for (int i = 0; i < slab.size() - 1; i++)
+ for (unsigned int i = 0; i < slab.size() - 1; i++)
{
if (slab[i].m_right_style >= 0)
{
@@ -393,7 +393,7 @@
}
else
{
- for (int i = 0; i < slab.size() - 1; i++)
+ for (unsigned int i = 0; i < slab.size() - 1; i++)
{
if (slab[i].m_left_style >= 0)
{
Index: gnash/server/text.cpp
diff -u gnash/server/text.cpp:1.5 gnash/server/text.cpp:1.6
--- gnash/server/text.cpp:1.5 Sat Feb 11 01:57:03 2006
+++ gnash/server/text.cpp Sat Feb 25 03:15:51 2006
@@ -73,7 +73,7 @@
float x = 0.0f;
float y = 0.0f;
- for (int i = 0; i < records.size(); i++)
+ for (unsigned int i = 0; i < records.size(); i++)
{
// Draw the characters within the current record; i.e.
consecutive
// chars that share a particular style.
@@ -116,7 +116,7 @@
rgba transformed_color =
cx.transform(rec.m_style.m_color);
- for (int j = 0; j < rec.m_glyphs.size(); j++)
+ for (unsigned int j = 0; j < rec.m_glyphs.size(); j++)
{
int index = rec.m_glyphs[j].m_glyph_index;
@@ -607,7 +607,7 @@
}
// Shift the beginnings of the records on this line.
- for (int i = last_line_start_record; i <
m_text_glyph_records.size(); i++)
+ for (unsigned int i = last_line_start_record; i <
m_text_glyph_records.size(); i++)
{
text_glyph_record& rec = m_text_glyph_records[i];
@@ -841,7 +841,7 @@
previous_x -=
last_line.m_glyphs[last_space_glyph].m_glyph_advance;
- for (int i = last_space_glyph + 1; i <
last_line.m_glyphs.size(); i++)
+ for (unsigned int i = last_space_glyph
+ 1; i < last_line.m_glyphs.size(); i++)
{
rec.m_glyphs.push_back(last_line.m_glyphs[i]);
x +=
last_line.m_glyphs[i].m_glyph_advance;
Index: gnash/server/xmlnode.cpp
diff -u gnash/server/xmlnode.cpp:1.5 gnash/server/xmlnode.cpp:1.6
--- gnash/server/xmlnode.cpp:1.5 Wed Feb 15 23:35:53 2006
+++ gnash/server/xmlnode.cpp Sat Feb 25 03:15:51 2006
@@ -269,7 +269,7 @@
XMLNode::nextSibling(int x)
{
log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
- if (x < _objects.size()) {
+ if (x < (int) _objects.size()) {
return _objects[x];
}
}
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.6 gnash/server/xmlsocket.cpp:1.7
--- gnash/server/xmlsocket.cpp:1.6 Mon Feb 13 10:44:12 2006
+++ gnash/server/xmlsocket.cpp Sat Feb 25 03:15:51 2006
@@ -456,7 +456,7 @@
void
XMLSocket::clear()
{
- int i;
+ unsigned int i;
for (i=0; i< _nodes.size(); i++) {
delete _nodes[i];
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash libbase/grid_index.h libbase/image_filter...,
Jim Garrison <=