[Gnash-commit] /srv/bzr/gnash/trunk r10369: Apply more build bug fixes from Tonko Juricic.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10369
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2008-11-28 09:23:30 +0100
message:
  Apply more build bug fixes from Tonko Juricic.
modified:
  libbase/SimpleBuffer.h
  libcore/SWFMatrix.cpp
  libcore/SWFStream.cpp
  libcore/SWFStream.h
  libcore/array.cpp
  libcore/vm/CodeStream.h
  libcore/vm/Machine.cpp
  libmedia/gst/VideoDecoderGst.cpp

=== modified file 'libbase/SimpleBuffer.h'
--- a/libbase/SimpleBuffer.h    2008-10-27 19:38:01 +0000
+++ b/libbase/SimpleBuffer.h    2008-11-28 08:23:30 +0000
@@ -148,7 +148,8 @@
        ///
        void append(const void* inData, size_t size)
        {
-               const boost::uint8_t* newData = reinterpret_cast<const 
uint8_t*>(inData);
+               const boost::uint8_t* newData = 
+            reinterpret_cast<const boost::uint8_t*>(inData);
                size_t curSize = _size;
                resize(curSize+size);
                std::copy(newData, newData+size, _data.get()+curSize);

=== modified file 'libcore/SWFMatrix.cpp'
--- a/libcore/SWFMatrix.cpp     2008-11-14 00:46:35 +0000
+++ b/libcore/SWFMatrix.cpp     2008-11-28 08:23:30 +0000
@@ -309,7 +309,8 @@
 double
 SWFMatrix::get_rotation() const
 {
-    return atan2(shx, sx); // more successes in misc-ming.all/SWFMatrix_test.c
+    // more successes in misc-ming.all/SWFMatrix_test.c
+    return atan2(static_cast<double>(shx), sx); 
 }
 
 // private

=== modified file 'libcore/SWFStream.cpp'
--- a/libcore/SWFStream.cpp     2008-10-20 17:06:14 +0000
+++ b/libcore/SWFStream.cpp     2008-11-28 08:23:30 +0000
@@ -317,12 +317,12 @@
         throw ParserException(_("Unexpected end of stream while reading"));
     }
     
-    uint64_t low = buf[0];
+    boost::uint64_t low = buf[0];
     low |= buf[1] << 8;
     low |= buf[2] << 16;
     low |= buf[3] << 24;
 
-    uint64_t hi = buf[4];
+    boost::uint64_t hi = buf[4];
     hi |= buf[5] << 8;
     hi |= buf[6] << 16;
     hi |= buf[7] << 24;
@@ -337,7 +337,8 @@
     return m_input->read_byte();
 }
 
-int8_t    SWFStream::read_s8()
+boost::int8_t
+SWFStream::read_s8()
 {
     // read_u8 will align
     return read_u8();

=== modified file 'libcore/SWFStream.h'
--- a/libcore/SWFStream.h       2008-10-02 16:12:12 +0000
+++ b/libcore/SWFStream.h       2008-11-28 08:23:30 +0000
@@ -159,7 +159,7 @@
        //
        /// aligned read
        ///
-       int8_t   read_s8();
+    boost::int8_t read_s8();
 
        /// Read a aligned unsigned 16-bit value from the stream.               
        //

=== modified file 'libcore/array.cpp'
--- a/libcore/array.cpp 2008-11-20 15:22:13 +0000
+++ b/libcore/array.cpp 2008-11-28 08:23:30 +0000
@@ -863,7 +863,7 @@
     }
 
 
-    return as_object::as_object::set_member(name,val, nsname, ifFound);
+    return as_object::set_member(name,val, nsname, ifFound);
 }
 
 Array_as*

=== modified file 'libcore/vm/CodeStream.h'
--- a/libcore/vm/CodeStream.h   2008-04-22 10:42:53 +0000
+++ b/libcore/vm/CodeStream.h   2008-11-28 08:23:30 +0000
@@ -178,11 +178,11 @@
        }
 
        /// Read a signed 8-bit character.
-       int8_t read_s8()
+    boost::int8_t read_s8()
        {
                if (mCurrent == mEnd)
                        throw CodeStreamException();
-               return static_cast<int8_t> (*mCurrent++);
+               return static_cast<boost::int8_t> (*mCurrent++);
        }
 
        /// Read an unsigned 8-bit character.

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2008-11-15 19:49:41 +0000
+++ b/libcore/vm/Machine.cpp    2008-11-28 08:23:30 +0000
@@ -793,7 +793,7 @@
 ///  byte -- as a raw byte
        case SWF::ABC_ACTION_PUSHBYTE:
        {
-               int8_t b = mStream->read_s8();
+        boost::int8_t b = mStream->read_s8();
                mStack.grow(1);
                mStack.top(0) = b;
                break;

=== modified file 'libmedia/gst/VideoDecoderGst.cpp'
--- a/libmedia/gst/VideoDecoderGst.cpp  2008-11-12 09:40:48 +0000
+++ b/libmedia/gst/VideoDecoderGst.cpp  2008-11-28 08:23:30 +0000
@@ -154,7 +154,7 @@
     } else {
         buffer = gst_buffer_new();
 
-        GST_BUFFER_DATA(buffer) = const_cast<uint8_t*>(frame.data());
+        GST_BUFFER_DATA(buffer) = const_cast<boost::uint8_t*>(frame.data());
         GST_BUFFER_SIZE(buffer) = frame.dataSize();
         GST_BUFFER_OFFSET(buffer) = frame.frameNum();
         GST_BUFFER_TIMESTAMP(buffer) = GST_CLOCK_TIME_NONE;