[Gnash-commit] gnash ./ChangeLog backend/render_handler_d3d.cp...

[Jim Garrison]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Jim Garrison <address@hidden>   06/02/25 15:27:35

Modified files:
        .              : ChangeLog 
        backend        : render_handler_d3d.cpp render_handler_xbox.cpp 
        libbase        : container.cpp 
        server         : morph.cpp morph.h 

Log message:
        2006-02-25  Jim Garrison  <address@hidden>
        
        * backend/render_handler_d3d.cpp: substituted array<> with
        std::vector<>
        * backend/render_handler_xbox.cpp: substituted array<> with
        std::vector<>
        * libbase/container.cpp: substituted array<> with std::vector<>
        * server/morph.cpp: substituted array<> with std::vector<>
        * server/morph.h: substituted array<> with std::vector<>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.158&tr2=1.159&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/render_handler_d3d.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/render_handler_xbox.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/container.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/morph.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/morph.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.158 gnash/ChangeLog:1.159
--- gnash/ChangeLog:1.158       Sat Feb 25 10:55:14 2006
+++ gnash/ChangeLog     Sat Feb 25 15:27:35 2006
@@ -1,3 +1,13 @@
+2006-02-25  Jim Garrison  <address@hidden>
+
+       * backend/render_handler_d3d.cpp: substituted array<> with
+       std::vector<>
+       * backend/render_handler_xbox.cpp: substituted array<> with
+       std::vector<>
+       * libbase/container.cpp: substituted array<> with std::vector<>
+       * server/morph.cpp: substituted array<> with std::vector<>
+       * server/morph.h: substituted array<> with std::vector<>
+
 2006-02-25 Michael Carlson <address@hidden>
 
        * server/sound_handler_mp3.cpp: Use std::vector<> instead of
Index: gnash/backend/render_handler_d3d.cpp
diff -u gnash/backend/render_handler_d3d.cpp:1.2 
gnash/backend/render_handler_d3d.cpp:1.3
--- gnash/backend/render_handler_d3d.cpp:1.2    Fri Feb 10 15:02:58 2006
+++ gnash/backend/render_handler_d3d.cpp        Sat Feb 25 15:27:35 2006
@@ -74,7 +74,7 @@
 
 namespace
 {
-  array<IDirect3DBaseTexture*> s_d3d_textures;
+  std::vector<IDirect3DBaseTexture*> s_d3d_textures;
 };
 
 static inline float clamp( float x,float min,float max ) {
Index: gnash/backend/render_handler_xbox.cpp
diff -u gnash/backend/render_handler_xbox.cpp:1.2 
gnash/backend/render_handler_xbox.cpp:1.3
--- gnash/backend/render_handler_xbox.cpp:1.2   Wed Feb  1 23:58:32 2006
+++ gnash/backend/render_handler_xbox.cpp       Sat Feb 25 15:27:35 2006
@@ -21,7 +21,7 @@
 
 
 namespace {
-       array<IDirect3DBaseTexture8*>   s_d3d_textures;
+       std::vector<IDirect3DBaseTexture8*>     s_d3d_textures;
        DWORD   s_vshader_handle = 0;
 
        // Our vertex coords consist of two signed 16-bit integers, for (x,y) 
position only.
Index: gnash/libbase/container.cpp
diff -u gnash/libbase/container.cpp:1.1 gnash/libbase/container.cpp:1.2
--- gnash/libbase/container.cpp:1.1     Tue Dec 20 20:57:00 2005
+++ gnash/libbase/container.cpp Sat Feb 25 15:27:35 2006
@@ -346,7 +346,7 @@
 void   test_hash()
 {
        // Collect a bunch of random key/value pairs.
-       array<Uint32>   data;
+       std::vector<Uint32>     data;
        for (int i = 0; i < 1000; i++)
        {
                data.push_back(tu_random::next_random());
@@ -440,7 +440,7 @@
        const int       SIZE = 1000000;
 
        // Make an array of random numbers.
-       array<uint32>   numbers;
+       std::vector<uint32>     numbers;
        numbers.resize(SIZE);
 
        for (int i = 0, n = numbers.size(); i < n; i++)
@@ -588,7 +588,7 @@
 #if 1
        printf("sizeof(tu_string) == %d\n", sizeof(tu_string));
 
-       array<tu_string>        storage;
+       std::vector<tu_string>  storage;
        storage.resize(2);
 
        tu_string&      a = storage[0];
@@ -680,7 +680,7 @@
 
        test_unicode();
 
-       // TODO: unit tests for array<>, string_hash<>
+       // TODO: unit tests for std::vector<>, string_hash<>
 #endif
 
        test_hash_speed();
Index: gnash/server/morph.cpp
diff -u gnash/server/morph.cpp:1.1 gnash/server/morph.cpp:1.2
--- gnash/server/morph.cpp:1.1  Tue Dec 20 21:01:18 2005
+++ gnash/server/morph.cpp      Sat Feb 25 15:27:35 2006
@@ -189,7 +189,7 @@
                                        current_path.m_edges[0].push_back(e);
                                        continue;
                                }
-                               array<edge> &edges = 
m_paths[pathidx].m_edges[1];
+                               std::vector<edge> &edges = 
m_paths[pathidx].m_edges[1];
                                edges[edgeidx] = e;
                                edgeidx++;
                                while (edgeidx == edges.size()) {
Index: gnash/server/morph.h
diff -u gnash/server/morph.h:1.1 gnash/server/morph.h:1.2
--- gnash/server/morph.h:1.1    Tue Dec 20 21:01:18 2005
+++ gnash/server/morph.h        Sat Feb 25 15:27:35 2006
@@ -22,7 +22,7 @@
 
                int m_fill0, m_fill1, m_line;
                float m_ax[2], m_ay[2];
-               array<edge> m_edges[2];
+               std::vector<edge> m_edges[2];
                bool m_new_shape;
        };
 
@@ -41,9 +41,9 @@
                                      bool start);
 
                rect    m_bound_orig, m_bound_target;
-               array<morph_fill_style> m_fill_styles;
-               array<morph_line_style> m_line_styles;
-               array<morph_path> m_paths;
+               std::vector<morph_fill_style> m_fill_styles;
+               std::vector<morph_line_style> m_line_styles;
+               std::vector<morph_path> m_paths;
 
                float m_last_ratio;
                mesh_set *m_last_mesh;