Fix the build with GCC4.8

Signed-off-by: Jérôme Duval <[email protected]>
This commit is contained in:
Murai Takashi
2013-12-17 18:01:44 +01:00
committed by Jérôme Duval
parent 3459199e5d
commit 70b978fd9f
8 changed files with 18 additions and 18 deletions
+4 -4
View File
@@ -154,10 +154,10 @@ namespace agg
return path_cmd_line_to; return path_cmd_line_to;
} }
double ct2_x; double ct2_x = 0;
double ct2_y; double ct2_y = 0;
double end_x; double end_x = 0;
double end_y; double end_y = 0;
unsigned cmd = m_source->vertex(x, y); unsigned cmd = m_source->vertex(x, y);
switch(cmd) switch(cmd)
@@ -187,8 +187,8 @@ namespace agg
template<class VertexSource> template<class VertexSource>
void add_path(VertexSource& vs, unsigned path_id=0) void add_path(VertexSource& vs, unsigned path_id=0)
{ {
double x; double x = 0;
double y; double y = 0;
unsigned cmd; unsigned cmd;
vs.rewind(path_id); vs.rewind(path_id);
@@ -457,7 +457,7 @@ TWO_KEY_AVL_TREE_CLASS_NAME::FindFirstClosest(const PrimaryKey& key, bool less,
{ {
const NodeStrategy& strategy = fTreeMap.GetNodeStrategy(); const NodeStrategy& strategy = fTreeMap.GetNodeStrategy();
Node* parent; Node* parent = NULL;
Node* node = _FindFirst(key, &parent); Node* node = _FindFirst(key, &parent);
if (node == NULL) { if (node == NULL) {
// not found -- try to get the closest node // not found -- try to get the closest node
@@ -1453,7 +1453,7 @@ void FlangerNode::filterBuffer(
for(uint32 inPos = 0; inPos < samples; ++inPos) { for(uint32 inPos = 0; inPos < samples; ++inPos) {
// read from input buffer // read from input buffer
_frame inFrame; _frame inFrame = {};
inFrame.channel[0] = ((float*)input.data())[inPos]; inFrame.channel[0] = ((float*)input.data())[inPos];
if(stereo) if(stereo)
inFrame.channel[1] = ((float*)input.data())[inPos + 1]; inFrame.channel[1] = ((float*)input.data())[inPos + 1];
@@ -1468,7 +1468,7 @@ void FlangerNode::filterBuffer(
// read low-index (possibly only) frame // read low-index (possibly only) frame
_frame delayedFrame; _frame delayedFrame = {};
int32 readFrameLo = (int32)floor(fReadFrame); int32 readFrameLo = (int32)floor(fReadFrame);
uint32 pos = readFrameLo * channels; uint32 pos = readFrameLo * channels;
@@ -623,7 +623,7 @@ AddPathsFromVertexSource(Icon* icon, Shape* shape,
return B_NO_MEMORY; return B_NO_MEMORY;
source.rewind(index); source.rewind(index);
double x1, y1; double x1 = 0, y1 = 0;
unsigned cmd = source.vertex(&x1, &y1); unsigned cmd = source.vertex(&x1, &y1);
bool keepGoing = true; bool keepGoing = true;
int32 subPath = 0; int32 subPath = 0;
@@ -688,7 +688,7 @@ AddPathsFromVertexSource(Icon* icon, Shape* shape,
break; break;
case agg::path_cmd_curve3: { case agg::path_cmd_curve3: {
double x2, y2; double x2 = 0, y2 = 0;
cmd = source.vertex(&x2, &y2); cmd = source.vertex(&x2, &y2);
//printf("curve3 (%.2f, %.2f)\n", x1, y1); //printf("curve3 (%.2f, %.2f)\n", x1, y1);
//printf(" (%.2f, %.2f)\n", x2, y2); //printf(" (%.2f, %.2f)\n", x2, y2);
@@ -715,8 +715,8 @@ AddPathsFromVertexSource(Icon* icon, Shape* shape,
} }
case agg::path_cmd_curve4: { case agg::path_cmd_curve4: {
double x2, y2; double x2 = 0, y2 = 0;
double x3, y3; double x3 = 0, y3 = 0;
cmd = source.vertex(&x2, &y2); cmd = source.vertex(&x2, &y2);
cmd = source.vertex(&x3, &y3); cmd = source.vertex(&x3, &y3);
+1 -1
View File
@@ -541,7 +541,7 @@ CopyEngine::_WriteThread()
bigtime_t now = system_time(); bigtime_t now = system_time();
Buffer* buffer; Buffer* buffer = NULL;
status_t ret = fBufferQueue.Pop(&buffer, bufferWaitTimeout); status_t ret = fBufferQueue.Pop(&buffer, bufferWaitTimeout);
if (ret == B_TIMED_OUT) { if (ret == B_TIMED_OUT) {
// no buffer, timeout // no buffer, timeout
+2 -2
View File
@@ -313,7 +313,7 @@ printf("InfoWin::Update(0x%08" B_PRIx32 ")\n", which);
fLabelsView->Insert(label << "\n\n\n"); fLabelsView->Insert(label << "\n\n\n");
BString s; BString s;
media_format format; media_format format;
media_raw_video_format videoFormat; media_raw_video_format videoFormat = {};
err = fController->GetEncodedVideoFormat(&format); err = fController->GetEncodedVideoFormat(&format);
if (err < B_OK) { if (err < B_OK) {
s << "(" << strerror(err) << ")\n"; s << "(" << strerror(err) << ")\n";
@@ -350,7 +350,7 @@ printf("InfoWin::Update(0x%08" B_PRIx32 ")\n", which);
fLabelsView->Insert(label << "\n\n\n"); fLabelsView->Insert(label << "\n\n\n");
BString s; BString s;
media_format format; media_format format;
media_raw_audio_format audioFormat; media_raw_audio_format audioFormat = {};
err = fController->GetEncodedAudioFormat(&format); err = fController->GetEncodedAudioFormat(&format);
//string_for_format(format, buf, sizeof(buf)); //string_for_format(format, buf, sizeof(buf));
//printf("%s\n", buf); //printf("%s\n", buf);
@@ -107,8 +107,8 @@ namespace agg
template<class VertexSource> template<class VertexSource>
void add_path(VertexSource& vs, unsigned path_id=0) void add_path(VertexSource& vs, unsigned path_id=0)
{ {
double x; double x = 0;
double y; double y = 0;
unsigned cmd; unsigned cmd;
vs.rewind(path_id); vs.rewind(path_id);