]>
Commit | Line | Data |
---|---|---|
6b745694 | 1 | diff -urN aa/avifile-0.7-0.7.38/include/aviplay.h avifile-0.7-0.7.38/include/aviplay.h |
2 | --- aa/avifile-0.7-0.7.38/include/aviplay.h 2003-05-25 00:51:30.000000000 +0200 | |
3 | +++ avifile-0.7-0.7.38/include/aviplay.h 2004-07-02 15:03:57.497990112 +0200 | |
4 | @@ -12,8 +12,8 @@ | |
5 | #include "image.h" | |
6 | #include "avm_args.h" | |
7 | ||
8 | -typedef void (*KILLHANDLER)(int, void* p = 0); | |
9 | -typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0); | |
10 | +typedef void (*KILLHANDLER)(int, void* p); | |
11 | +typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p); | |
12 | ||
13 | AVM_BEGIN_NAMESPACE; | |
14 | ||
15 | diff -urN aa/avifile-0.7-0.7.38/include/avm_map.h avifile-0.7-0.7.38/include/avm_map.h | |
16 | --- aa/avifile-0.7-0.7.38/include/avm_map.h 2003-03-27 02:01:22.000000000 +0100 | |
17 | +++ avifile-0.7-0.7.38/include/avm_map.h 2004-07-02 15:15:04.427601400 +0200 | |
18 | @@ -198,7 +198,8 @@ | |
19 | { | |
20 | // cast to the needed type - used to prevent internal compiler error | |
21 | // for old egcc | |
22 | - avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n; | |
23 | + //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n; | |
24 | + _Tnode* node = (_Tnode*) n; | |
25 | ||
26 | if(node->entry) | |
27 | { | |
28 | diff -urN aa/avifile-0.7-0.7.38/include/avm_stl.h avifile-0.7-0.7.38/include/avm_stl.h | |
29 | --- aa/avifile-0.7-0.7.38/include/avm_stl.h 2003-06-08 17:57:05.000000000 +0200 | |
30 | +++ avifile-0.7-0.7.38/include/avm_stl.h 2004-07-02 15:12:53.351527992 +0200 | |
31 | @@ -74,6 +74,7 @@ | |
32 | m_Type = new Type[m_uiCapacity]; | |
33 | } | |
34 | ~qring() { delete[] m_Type; } | |
35 | + qring<Type>(const qring<Type>& t) {} | |
36 | qring<Type>& operator=(const qring<Type>& t) | |
37 | { | |
38 | if (this != &t) | |
39 | @@ -149,7 +150,6 @@ | |
40 | ||
41 | // disabled for now | |
42 | qring<Type>() {} | |
43 | - qring<Type>(const qring<Type>& t) {} | |
44 | ||
45 | uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; } | |
46 | uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; } | |
47 | diff -urN aa/avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp | |
48 | --- aa/avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2003-05-27 17:26:31.000000000 +0200 | |
49 | +++ avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2004-07-02 15:08:12.642202296 +0200 | |
50 | @@ -793,22 +793,24 @@ | |
51 | return -1; | |
52 | } | |
53 | ||
54 | -int AsfNetworkInputStream::write(const void* buffer, uint_t size) | |
55 | +int AsfNetworkInputStream::write(const void* b, uint_t size) | |
56 | { | |
57 | + const char* buffer = (const char*) b; | |
58 | int wsize = size; | |
59 | while (wsize > 0) | |
60 | { | |
61 | int i = ::write(m_iSocket, buffer, wsize); | |
62 | if (i <= 0) | |
63 | return i; | |
64 | - (const char*)buffer += i; | |
65 | + buffer += i; | |
66 | wsize -= i; | |
67 | } | |
68 | return size; | |
69 | } | |
70 | ||
71 | -int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size) | |
72 | +int AsfNetworkInputStream::dwrite(const void* b, uint_t size) | |
73 | { | |
74 | + const char* buffer = (const char*) b; | |
75 | if (m_lfd < 0) | |
76 | { | |
77 | if (m_lfd == -12345) | |
78 | @@ -843,7 +845,7 @@ | |
79 | int i = ::write(m_lfd, buffer, size); | |
80 | if (i < 0) | |
81 | return i; | |
82 | - (const char*)buffer += i; | |
83 | + buffer += i; | |
84 | size -= i; | |
85 | } | |
86 | fsync(m_lfd); | |
87 | diff -urN aa/avifile-0.7-0.7.38/lib/common/image.cpp avifile-0.7-0.7.38/lib/common/image.cpp | |
88 | --- aa/avifile-0.7-0.7.38/lib/common/image.cpp 2003-05-25 01:00:58.000000000 +0200 | |
89 | +++ avifile-0.7-0.7.38/lib/common/image.cpp 2004-07-02 15:16:53.695990080 +0200 | |
90 | @@ -954,7 +954,7 @@ | |
91 | fillMembers(); | |
92 | if (!copy) | |
93 | { | |
94 | - (const uint8_t*) m_pPlane[0] = data; | |
95 | + m_pPlane[0] = (uint8_t*) data; | |
96 | } | |
97 | else | |
98 | { | |
99 | diff -urN aa/avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp | |
100 | --- aa/avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2003-05-20 16:33:13.000000000 +0200 | |
101 | +++ avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2004-07-02 15:19:50.622093224 +0200 | |
102 | @@ -96,7 +96,7 @@ | |
103 | op.packet = NULL; | |
104 | op.b_o_s = 1; /* beginning of stream for first packet */ | |
105 | op.bytes = hdrsizes[0]; | |
106 | - (const void*) op.packet = vorbishdr; | |
107 | + op.packet = (unsigned char*) vorbishdr; | |
108 | vorbishdr += op.bytes; | |
109 | if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) | |
110 | { | |
111 | @@ -106,7 +106,7 @@ | |
112 | ||
113 | op.b_o_s = 0; | |
114 | op.bytes = hdrsizes[1]; | |
115 | - (const void*) op.packet = vorbishdr; | |
116 | + op.packet = (unsigned char*) vorbishdr; | |
117 | vorbishdr += op.bytes; | |
118 | if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) | |
119 | { | |
120 | @@ -115,7 +115,7 @@ | |
121 | } | |
122 | ||
123 | op.bytes = hdrsizes[2]; | |
124 | - (const void*) op.packet = vorbishdr; | |
125 | + op.packet = (unsigned char*) vorbishdr; | |
126 | vorbishdr += op.bytes; | |
127 | if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) | |
128 | { |