]> git.pld-linux.org Git - packages/cdrdao.git/blame - cdrdao-gcc34.patch
- updated to 1.1.9
[packages/cdrdao.git] / cdrdao-gcc34.patch
CommitLineData
a0c72986
PS
1diff -uNr cdrdao-1.1.8.orig/dao/CDD2600Base.cc cdrdao-1.1.8/dao/CDD2600Base.cc
2--- cdrdao-1.1.8.orig/dao/CDD2600Base.cc 2001-01-28 11:37:15.000000000 +0100
3+++ cdrdao-1.1.8/dao/CDD2600Base.cc 2004-04-01 15:07:19.941993720 +0200
4@@ -190,7 +190,7 @@
5 indexCount, dataLen);
6 */
7
8- data = new (unsigned char)[dataLen];
9+ data = new unsigned char[dataLen];
10 memset(data, 0, dataLen);
11 tp = data;
12
13diff -uNr cdrdao-1.1.8.orig/dao/CDD2600.cc cdrdao-1.1.8/dao/CDD2600.cc
14--- cdrdao-1.1.8.orig/dao/CDD2600.cc 2002-01-20 21:43:36.000000000 +0100
15+++ cdrdao-1.1.8/dao/CDD2600.cc 2004-04-01 15:07:19.942993568 +0200
16@@ -446,7 +446,7 @@
17 {
18 unsigned char cmd[10];
19 unsigned long dataLen = 2 * blockLength_;
20- unsigned char *data = new (unsigned char)[dataLen];
21+ unsigned char *data = new unsigned char[dataLen];
22
23
24 // read sub channel information
25@@ -666,7 +666,7 @@
26
27 message(5, "Raw toc data len: %d", dataLen);
28
29- data = new (unsigned char)[dataLen];
30+ data = new unsigned char[dataLen];
31
32 // read disk toc
33 cmd[7] = dataLen >> 8;
34diff -uNr cdrdao-1.1.8.orig/dao/CdrDriver.cc cdrdao-1.1.8/dao/CdrDriver.cc
35--- cdrdao-1.1.8.orig/dao/CdrDriver.cc 2004-02-12 02:13:30.000000000 +0100
36+++ cdrdao-1.1.8/dao/CdrDriver.cc 2004-04-01 15:07:19.953991896 +0200
37@@ -878,10 +878,10 @@
38
39 scsiMaxDataLen_ = scsiIf_->maxDataLen();
40
41- transferBuffer_ = new (unsigned char)[scsiMaxDataLen_];
42+ transferBuffer_ = new unsigned char[scsiMaxDataLen_];
43
44 maxScannedSubChannels_ = scsiMaxDataLen_ / (AUDIO_BLOCK_LEN + PW_SUBCHANNEL_LEN);
45- scannedSubChannels_ = new (SubChannel*)[maxScannedSubChannels_];
46+ scannedSubChannels_ = new SubChannel *[maxScannedSubChannels_];
47
48 paranoia_ = NULL;
49 paranoiaDrive_ = NULL;
50@@ -1343,7 +1343,7 @@
51 unsigned char cmd[10];
52 long dataLen = bufLen + 8/*mode parameter header*/ +
53 100/*spare for block descriptors*/;
54- unsigned char *data = new (unsigned char)[dataLen];
55+ unsigned char *data = new unsigned char[dataLen];
56
57 memset(cmd, 0, 10);
58 memset(data, 0, dataLen);
59@@ -1407,7 +1407,7 @@
60 if (blockDesc != NULL)
61 dataLen += 8;
62
63- unsigned char *data = new (unsigned char)[dataLen];
64+ unsigned char *data = new unsigned char[dataLen];
65
66 memset(cmd, 0, 10);
67 memset(data, 0, dataLen);
68@@ -1466,7 +1466,7 @@
69 unsigned char cmd[6];
70 long dataLen = bufLen + 4/*mode parameter header*/ +
71 100/*spare for block descriptors*/;
72- unsigned char *data = new (unsigned char)[dataLen];
73+ unsigned char *data = new unsigned char[dataLen];
74
75 memset(cmd, 0, 6);
76 memset(data, 0, dataLen);
77@@ -1529,7 +1529,7 @@
78 if (blockDesc != NULL)
79 dataLen += 8;
80
81- unsigned char *data = new (unsigned char)[dataLen];
82+ unsigned char *data = new unsigned char[dataLen];
83
84 memset(cmd, 0, 6);
85 memset(data, 0, dataLen);
86@@ -1602,7 +1602,7 @@
87 dataLen = (100 * 8) + 4;
88 }
89
90- data = new (unsigned char)[dataLen];
91+ data = new unsigned char[dataLen];
92 memset(data, 0, dataLen);
93
94 // read disk toc
95@@ -2940,7 +2940,7 @@
96 return NULL;
97 }
98
99- data = new (unsigned char)[len];
100+ data = new unsigned char[len];
101
102 cmd[7] = len >> 8;
103 cmd[8] = len;
104@@ -3677,7 +3677,7 @@
105 blocking = scsiMaxDataLen_ / (AUDIO_BLOCK_LEN + PW_SUBCHANNEL_LEN);
106 assert(blocking > 0);
107
108- buf = new (unsigned char)[blocking * blockLen];
109+ buf = new unsigned char[blocking * blockLen];
110
111 lba = lastLba = start;
112 burst = blocking;
113diff -uNr cdrdao-1.1.8.orig/dao/CdTextEncoder.cc cdrdao-1.1.8/dao/CdTextEncoder.cc
114--- cdrdao-1.1.8.orig/dao/CdTextEncoder.cc 2001-01-28 11:37:15.000000000 +0100
115+++ cdrdao-1.1.8/dao/CdTextEncoder.cc 2004-04-01 15:07:19.955991592 +0200
116@@ -439,7 +439,7 @@
117 return;
118 }
119
120- subChannels_ = new (PWSubChannel96*)[subChannelCount_];
121+ subChannels_ = new PWSubChannel96 *[subChannelCount_];
122
123 prun = packs_;
124
125diff -uNr cdrdao-1.1.8.orig/dao/GenericMMC.cc cdrdao-1.1.8/dao/GenericMMC.cc
126--- cdrdao-1.1.8.orig/dao/GenericMMC.cc 2004-02-12 02:13:30.000000000 +0100
127+++ cdrdao-1.1.8/dao/GenericMMC.cc 2004-04-01 15:07:19.959990984 +0200
128@@ -747,7 +747,7 @@
129 len += t->nofIndices(); // entry for each index increment
130 }
131
132- cueSheet = new (unsigned char)[len * 8];
133+ cueSheet = new unsigned char[len * 8];
134 n = 0;
135
136 if (toc_->leadInMode() == TrackData::AUDIO) {
137@@ -1872,7 +1872,7 @@
138 if (len > bufLen)
139 len = bufLen;
140
141- data = new (unsigned char)[len + 8];
142+ data = new unsigned char[len + 8];
143
144 cmd[7] = (len + 8) >> 8;
145 cmd[8] = (len + 8);
146@@ -2014,7 +2014,7 @@
147
148 message(4, "Raw toc data len: %d", dataLen);
149
150- data = new (unsigned char)[dataLen];
151+ data = new unsigned char[dataLen];
152
153 // read disk toc
154 cmd[7] = dataLen >> 8;
155diff -uNr cdrdao-1.1.8.orig/dao/GenericMMCraw.cc cdrdao-1.1.8/dao/GenericMMCraw.cc
156--- cdrdao-1.1.8.orig/dao/GenericMMCraw.cc 2002-11-24 18:25:16.000000000 +0100
157+++ cdrdao-1.1.8/dao/GenericMMCraw.cc 2004-04-01 15:07:19.960990832 +0200
158@@ -498,10 +498,10 @@
159 // allocate buffer for sub-channel encoding
160 n = blocksPerWrite_ * blockLength_;
161 delete[] encodeBuffer_;
162- encodeBuffer_ = new (unsigned char)[n];
163+ encodeBuffer_ = new unsigned char[n];
164
165 delete[] encSubChannel_;
166- encSubChannel_ = new (unsigned char)[blocksPerWrite_ * subChannel_->dataLength()];
167+ encSubChannel_ = new unsigned char[blocksPerWrite_ * subChannel_->dataLength()];
168
169 /*
170 SessionInfo sessInfo;
171diff -uNr cdrdao-1.1.8.orig/dao/PlextorReader.cc cdrdao-1.1.8/dao/PlextorReader.cc
172--- cdrdao-1.1.8.orig/dao/PlextorReader.cc 2002-12-03 22:35:36.000000000 +0100
173+++ cdrdao-1.1.8/dao/PlextorReader.cc 2004-04-01 15:07:19.962990528 +0200
174@@ -453,7 +453,7 @@
175
176 message(4, "Raw toc data len: %d", dataLen);
177
178- data = new (unsigned char)[dataLen];
179+ data = new unsigned char[dataLen];
180
181 // read disk toc
182 cmd[7] = dataLen >> 8;
183@@ -685,7 +685,7 @@
184
185 int overspeed,cai=-1;
186
187- data = new (unsigned char)[blocksPerRead * blockLength];
188+ data = new unsigned char[blocksPerRead * blockLength];
189
190 fat = startTrack;
191 lat = endTrack;
192diff -uNr cdrdao-1.1.8.orig/dao/PQChannelEncoder.cc cdrdao-1.1.8/dao/PQChannelEncoder.cc
193--- cdrdao-1.1.8.orig/dao/PQChannelEncoder.cc 2001-09-03 19:37:42.000000000 +0200
194+++ cdrdao-1.1.8/dao/PQChannelEncoder.cc 2004-04-01 15:07:19.963990376 +0200
195@@ -106,7 +106,7 @@
196
197 // create PQ sub channels for toc in lead-in
198 tocLen_ = lastTrackNr_ - firstTrackNr_ + 1 + 3/*A0, A1, A2*/;
199- toc_ = new (SubChannel*)[tocLen_];
200+ toc_ = new SubChannel *[tocLen_];
201
202 for (i = 0; i < tocLen_; i++) {
203 toc_[i] = subChannel_->makeSubChannel(SubChannel::QMODE1TOC);
204diff -uNr cdrdao-1.1.8.orig/dao/SonyCDU920.cc cdrdao-1.1.8/dao/SonyCDU920.cc
205--- cdrdao-1.1.8.orig/dao/SonyCDU920.cc 2002-01-20 21:43:36.000000000 +0100
206+++ cdrdao-1.1.8/dao/SonyCDU920.cc 2004-04-01 15:07:19.964990224 +0200
207@@ -250,7 +250,7 @@
208 len += t->nofIndices(); // entry for each index increment
209 }
210
211- cueSheet = new (unsigned char)[len * 8];
212+ cueSheet = new unsigned char[len * 8];
213 n = 0;
214
215 // entry for lead-in
216@@ -803,7 +803,7 @@
217
218 message(4, "Raw toc data len: %d", dataLen);
219
220- data = new (unsigned char)[dataLen];
221+ data = new unsigned char[dataLen];
222
223 // read disk toc
224 cmd[7] = dataLen >> 8;
225diff -uNr cdrdao-1.1.8.orig/dao/TeacCdr55.cc cdrdao-1.1.8/dao/TeacCdr55.cc
226--- cdrdao-1.1.8.orig/dao/TeacCdr55.cc 2002-01-20 21:43:36.000000000 +0100
227+++ cdrdao-1.1.8/dao/TeacCdr55.cc 2004-04-01 15:07:19.966989920 +0200
228@@ -1291,7 +1291,7 @@
229 if (dataLen == 4)
230 return NULL;
231
232- data = new (unsigned char)[dataLen];
233+ data = new unsigned char[dataLen];
234
235 // read disk toc
236 cmd[7] = dataLen >> 8;
237diff -uNr cdrdao-1.1.8.orig/dao/YamahaCDR10x.cc cdrdao-1.1.8/dao/YamahaCDR10x.cc
238--- cdrdao-1.1.8.orig/dao/YamahaCDR10x.cc 2002-01-20 21:43:36.000000000 +0100
239+++ cdrdao-1.1.8/dao/YamahaCDR10x.cc 2004-04-01 15:07:19.968989616 +0200
240@@ -291,7 +291,7 @@
241 len += t->nofIndices(); // entry for each index increment
242 }
243
244- cueSheet = new (unsigned char)[len * 8];
245+ cueSheet = new unsigned char[len * 8];
246 n = 0;
247
248 if (toc_->leadInMode() == TrackData::AUDIO)
249diff -uNr cdrdao-1.1.8.orig/trackdb/Cddb.cc cdrdao-1.1.8/trackdb/Cddb.cc
250--- cdrdao-1.1.8.orig/trackdb/Cddb.cc 2001-09-03 19:37:42.000000000 +0200
251+++ cdrdao-1.1.8/trackdb/Cddb.cc 2004-04-01 15:07:19.970989312 +0200
252@@ -590,7 +590,7 @@
253
254 nargs = ntracks + 5;
255
256- args = new (const char*)[nargs];
257+ args = new const char *[nargs];
258 arg = 0;
259
260 args[arg++] = "cddb";
261@@ -1244,8 +1244,8 @@
262 cddbEntry_->diskArtist = NULL;
263 cddbEntry_->diskExt = NULL;
264 cddbEntry_->ntracks = ntracks;
265- cddbEntry_->trackTitles = new (char*)[ntracks];
266- cddbEntry_->trackExt = new (char*)[ntracks];
267+ cddbEntry_->trackTitles = new char *[ntracks];
268+ cddbEntry_->trackExt = new char *[ntracks];
269
270 for (i = 0; i < ntracks; i++) {
271 cddbEntry_->trackTitles[i] = NULL;
272diff -uNr cdrdao-1.1.8.orig/trackdb/CdTextItem.cc cdrdao-1.1.8/trackdb/CdTextItem.cc
273--- cdrdao-1.1.8.orig/trackdb/CdTextItem.cc 2002-01-20 21:43:36.000000000 +0100
274+++ cdrdao-1.1.8/trackdb/CdTextItem.cc 2004-04-01 15:07:19.971989160 +0200
275@@ -36,7 +36,7 @@
276
277 dataLen_ = strlen(data) + 1;
278
279- data_ = new (unsigned char)[dataLen_];
280+ data_ = new unsigned char[dataLen_];
281
282 strcpy((char *)data_, data);
283 }
284@@ -56,7 +56,7 @@
285 dataLen_ = len;
286
287 if (len > 0) {
288- data_ = new (unsigned char)[len];
289+ data_ = new unsigned char[len];
290 memcpy(data_, data, len);
291 }
292 else {
293@@ -80,7 +80,7 @@
294 if (description != NULL)
295 dataLen_ += strlen(description) + 1;
296
297- data_ = new (unsigned char)[dataLen_];
298+ data_ = new unsigned char[dataLen_];
299 data_[0] = genreCode1;
300 data_[1] = genreCode2;
301
302@@ -99,7 +99,7 @@
303 dataLen_ = obj.dataLen_;
304
305 if (dataLen_ > 0) {
306- data_ = new (unsigned char)[dataLen_];
307+ data_ = new unsigned char[dataLen_];
308 memcpy(data_, obj.data_, dataLen_);
309 }
310 else {
311diff -uNr cdrdao-1.1.8.orig/trackdb/Track.cc cdrdao-1.1.8/trackdb/Track.cc
312--- cdrdao-1.1.8.orig/trackdb/Track.cc 2002-10-13 13:03:08.000000000 +0200
313+++ cdrdao-1.1.8/trackdb/Track.cc 2004-04-01 15:06:50.000000000 +0200
314@@ -41,7 +41,7 @@
315 subTracks_ = lastSubTrack_ = NULL;
316
317 nofIndices_ = 0;
318- index_ = new Msf[98](0);
319+ index_ = new Msf[98];
320
321 isrcValid_ = 0;
322
323@@ -75,7 +75,7 @@
324 }
325
326 nofIndices_ = obj.nofIndices_;
327- index_ = new Msf[98](0);
328+ index_ = new Msf[98];
329 for (i = 0; i < nofIndices_; i++) {
330 index_[i] = obj.index_[i];
331 }
This page took 0.120537 seconds and 4 git commands to generate.