Changeset 2291 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx

Timestamp:

03/26/07 08:46:55 (17 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools

Files:

• Array.h (modified) (5 diffs)
• Buffer.h (modified) (1 diff)
• Heap.h (modified) (1 diff)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools/Array.h

@@ -37 +37 @@
                 inline void array<T>::init(int l)
                 {
-                        data = new T[l];
-                        len = l;
+                        data    =       new T[l];
+                        len             =       l;
                 }
 
@@ -44 +44 @@
                 inline void array<T>::f_r_e_e()
                 {
-                        if( data )
+                        if(data)
                         {
-                                delete[] data;
+                                delete  [] data;
                                 data = NULL;
                         }
@@ -55 +55 @@
                 {
 #ifdef SAFETY
-                        assert( data );
-                        assert( i>=0 && i<len );
+                        assert(data);
+                        assert(i >= 0 && i < len);
 #endif
                         return data[i];
@@ -65 +65 @@
                 {
 #ifdef SAFETY
-                        assert( data );
-                        assert( i>=0 && i<len );
+                        assert(data);
+                        assert(i >= 0 && i < len);
 #endif
                         return data[i];
@@ -74 +74 @@
                 inline void array<T>::resize(int l)
                 {
-                        T *old = data;
-                        data = new T[l];
-                        data = (T *)memcpy(data,old,MIN(len,l)*sizeof(T));
-                        len = l;
-                        delete[] old;
+                        T *old  =       data;
+                        data            =       new T[l];
+                        data            =       (T *)memcpy(data,old,MIN(len,l)*sizeof(T));
+                        len                     =       l;
+
+                        delete  [] old;
                 }
 }

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools/Buffer.h

@@ -7 +7 @@
 {
         template<class T>
-        class buffer : public array<T> {
-        protected:
-                int fill;
-        public:
-                buffer() { init(8); }
-                buffer(int l) { init(l); }
-    
-                inline void init(int l) { array<T>::init(l); fill=0; }
+                class buffer : public array<T> {
+                        protected:
+                                int fill;
+                        public:
+                                buffer() { init(8); }
+                                buffer(int l) { init(l); }
 
-                inline int add(const T& t);
-                inline void reset();
-                inline int find(const T&);
-                inline T remove(int i);
-                inline int addAll(const buffer<T>& buf);
-                inline void removeDuplicates();
+                                inline void init(int l) { array<T>::init(l); fill=0; }
 
-                inline int length() const { return fill; }
-                inline int maxLength() const { return len; }
-                inline void setFill(int l){fill =       l;}
-        };
+                                inline int add(const T& t);
+                                inline void reset();
+                                inline int find(const T&);
+                                inline T remove(int i);
+                                inline int addAll(const buffer<T>& buf);
+                                inline void removeDuplicates();
+
+                                inline int length() const { return fill; }
+                                inline int maxLength() const { return len; }
+                                inline void setFill(int l){fill =       l;}
+                };
 
         template<class T>
-        inline int buffer<T>::add(const T& t)
-        {
-                if( fill == len )
+                inline int buffer<T>::add(const T& t)
                 {
-                        resize( len*2 );
+                        if(fill == len)
+                        {
+                                resize(len * 2);
+                        }
+
+                        data[fill] = t;
+
+                        return fill++;
                 }
 
-                data[fill] = t;
-
-                return fill++;
-        }
+        template<class T>
+                inline void buffer<T>::reset()
+                {
+                        fill = 0;
+                }
 
         template<class T>
-        inline void buffer<T>::reset()
-        {
-                fill = 0;
-        }
+                inline int buffer<T>::find(const T& t)
+                {
+                        for(int i=0;i<fill;i++)
+                                if( data[i] == t )
+                                        return i;
+
+                        return -1;
+                }
 
         template<class T>
-        inline int buffer<T>::find(const T& t)
-        {
-                for(int i=0;i<fill;i++)
-                if( data[i] == t )
-                        return i;
+                inline T buffer<T>::remove(int i)
+                {
+#ifdef SAFETY
+                        assert( i>=0 );
+                        assert( i<fill );
+#endif
 
-                return -1;
-        }
+                        fill--;
+                        T temp = data[i];
+                        data[i] = data[fill];
+
+                        return temp;
+                }
 
         template<class T>
-        inline T buffer<T>::remove(int i)
-        {
-        #ifdef SAFETY
-                assert( i>=0 );
-                assert( i<fill );
-        #endif
+                inline int buffer<T>::addAll(const buffer<T>& buf)
+                {
+                        for (int i=0; i<buf.fill; i++)
+                                add(buf(i));
 
-                fill--;
-                T temp = data[i];
-                data[i] = data[fill];
-
-                return temp;
-        }
+                        return fill;
+                }
 
         template<class T>
-        inline int buffer<T>::addAll(const buffer<T>& buf)
-        {
-                for(int i=0; i<buf.fill; i++)
-                add(buf(i));
-
-                return fill;
-        }
-
-        template<class T>
-        inline void buffer<T>::removeDuplicates()
-        {
-                for(int i=0; i<fill; i++)
+                inline void buffer<T>::removeDuplicates()
                 {
-                for(int j=i+1; j<fill; )
-                {
-                        if( data[j] == data[i] )
-                        remove(j);
-                        else
-                        j++;
+                        for (int i=0; i<fill; i++)
+                        {
+                                for (int j=i+1; j<fill; )
+                                {
+                                        if ( data[j] == data[i] )
+                                                remove(j);
+                                        else
+                                                j++;
+                                }
+                        }
                 }
-                }
-        }
 }
 

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools/Heap.h

@@ -33 +33 @@
         {
                 public:
+
                         float import;
                         Heapable *obj;