From 93cc33d9264d7cffeb0c0eb704efd45c8ba70054 Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Thu, 5 Dec 2013 21:41:50 +0900
Subject: [PATCH] Fix build with gcc48 (except apps/Installer)
---
headers/libs/agg/agg_conv_curve.h | 8 ++++----
headers/libs/agg/agg_rasterizer_scanline_aa.h | 4 ++--
.../file_systems/packagefs/util/TwoKeyAVLTree.h | 2 +-
src/apps/cortex/addons/Flanger/FlangerNode.cpp | 4 ++--
.../import_export/svg/DocumentBuilder.cpp | 8 ++++----
src/apps/mediaplayer/InfoWin.cpp | 4 ++--
.../Painter/agg_rasterizer_scanline_aa_subpix.h | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/headers/libs/agg/agg_conv_curve.h b/headers/libs/agg/agg_conv_curve.h
index 8c5d397..f682a59 100644
a
|
b
|
namespace agg
|
154 | 154 | return path_cmd_line_to; |
155 | 155 | } |
156 | 156 | |
157 | | double ct2_x; |
158 | | double ct2_y; |
159 | | double end_x; |
160 | | double end_y; |
| 157 | double ct2_x = 0; |
| 158 | double ct2_y = 0; |
| 159 | double end_x = 0; |
| 160 | double end_y = 0; |
161 | 161 | |
162 | 162 | unsigned cmd = m_source->vertex(x, y); |
163 | 163 | switch(cmd) |
diff --git a/headers/libs/agg/agg_rasterizer_scanline_aa.h b/headers/libs/agg/agg_rasterizer_scanline_aa.h
index 2b69db6..39286d7 100644
a
|
b
|
namespace agg
|
187 | 187 | template<class VertexSource> |
188 | 188 | void add_path(VertexSource& vs, unsigned path_id=0) |
189 | 189 | { |
190 | | double x; |
191 | | double y; |
| 190 | double x = 0; |
| 191 | double y = 0; |
192 | 192 | |
193 | 193 | unsigned cmd; |
194 | 194 | vs.rewind(path_id); |
diff --git a/src/add-ons/kernel/file_systems/packagefs/util/TwoKeyAVLTree.h b/src/add-ons/kernel/file_systems/packagefs/util/TwoKeyAVLTree.h
index ee9d046..4579fdc 100644
a
|
b
|
TWO_KEY_AVL_TREE_CLASS_NAME::FindFirstClosest(const PrimaryKey& key, bool less,
|
457 | 457 | { |
458 | 458 | const NodeStrategy& strategy = fTreeMap.GetNodeStrategy(); |
459 | 459 | |
460 | | Node* parent; |
| 460 | Node* parent = NULL; |
461 | 461 | Node* node = _FindFirst(key, &parent); |
462 | 462 | if (node == NULL) { |
463 | 463 | // not found -- try to get the closest node |
diff --git a/src/apps/cortex/addons/Flanger/FlangerNode.cpp b/src/apps/cortex/addons/Flanger/FlangerNode.cpp
index 157ee1a..4a64417 100644
a
|
b
|
void FlangerNode::filterBuffer(
|
1453 | 1453 | for(uint32 inPos = 0; inPos < samples; ++inPos) { |
1454 | 1454 | |
1455 | 1455 | // read from input buffer |
1456 | | _frame inFrame; |
| 1456 | _frame inFrame = {}; |
1457 | 1457 | inFrame.channel[0] = ((float*)input.data())[inPos]; |
1458 | 1458 | if(stereo) |
1459 | 1459 | inFrame.channel[1] = ((float*)input.data())[inPos + 1]; |
… |
… |
void FlangerNode::filterBuffer(
|
1468 | 1468 | |
1469 | 1469 | |
1470 | 1470 | // read low-index (possibly only) frame |
1471 | | _frame delayedFrame; |
| 1471 | _frame delayedFrame = {}; |
1472 | 1472 | |
1473 | 1473 | int32 readFrameLo = (int32)floor(fReadFrame); |
1474 | 1474 | uint32 pos = readFrameLo * channels; |
diff --git a/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.cpp b/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.cpp
index d8f8bf5..f0ca0a5 100644
a
|
b
|
AddPathsFromVertexSource(Icon* icon, Shape* shape,
|
623 | 623 | return B_NO_MEMORY; |
624 | 624 | |
625 | 625 | source.rewind(index); |
626 | | double x1, y1; |
| 626 | double x1 = 0, y1 = 0; |
627 | 627 | unsigned cmd = source.vertex(&x1, &y1); |
628 | 628 | bool keepGoing = true; |
629 | 629 | int32 subPath = 0; |
… |
… |
AddPathsFromVertexSource(Icon* icon, Shape* shape,
|
688 | 688 | break; |
689 | 689 | |
690 | 690 | case agg::path_cmd_curve3: { |
691 | | double x2, y2; |
| 691 | double x2 = 0, y2 = 0; |
692 | 692 | cmd = source.vertex(&x2, &y2); |
693 | 693 | //printf("curve3 (%.2f, %.2f)\n", x1, y1); |
694 | 694 | //printf(" (%.2f, %.2f)\n", x2, y2); |
… |
… |
AddPathsFromVertexSource(Icon* icon, Shape* shape,
|
715 | 715 | } |
716 | 716 | |
717 | 717 | case agg::path_cmd_curve4: { |
718 | | double x2, y2; |
719 | | double x3, y3; |
| 718 | double x2 = 0, y2 = 0; |
| 719 | double x3 = 0, y3 = 0; |
720 | 720 | cmd = source.vertex(&x2, &y2); |
721 | 721 | cmd = source.vertex(&x3, &y3); |
722 | 722 | |
diff --git a/src/apps/mediaplayer/InfoWin.cpp b/src/apps/mediaplayer/InfoWin.cpp
index b9d6c30..62919de 100644
a
|
b
|
printf("InfoWin::Update(0x%08" B_PRIx32 ")\n", which);
|
313 | 313 | fLabelsView->Insert(label << "\n\n\n"); |
314 | 314 | BString s; |
315 | 315 | media_format format; |
316 | | media_raw_video_format videoFormat; |
| 316 | media_raw_video_format videoFormat = {}; |
317 | 317 | err = fController->GetEncodedVideoFormat(&format); |
318 | 318 | if (err < B_OK) { |
319 | 319 | s << "(" << strerror(err) << ")\n"; |
… |
… |
printf("InfoWin::Update(0x%08" B_PRIx32 ")\n", which);
|
350 | 350 | fLabelsView->Insert(label << "\n\n\n"); |
351 | 351 | BString s; |
352 | 352 | media_format format; |
353 | | media_raw_audio_format audioFormat; |
| 353 | media_raw_audio_format audioFormat = {}; |
354 | 354 | err = fController->GetEncodedAudioFormat(&format); |
355 | 355 | //string_for_format(format, buf, sizeof(buf)); |
356 | 356 | //printf("%s\n", buf); |
diff --git a/src/servers/app/drawing/Painter/agg_rasterizer_scanline_aa_subpix.h b/src/servers/app/drawing/Painter/agg_rasterizer_scanline_aa_subpix.h
index 806f8c9..144282b 100644
a
|
b
|
namespace agg
|
107 | 107 | template<class VertexSource> |
108 | 108 | void add_path(VertexSource& vs, unsigned path_id=0) |
109 | 109 | { |
110 | | double x; |
111 | | double y; |
| 110 | double x = 0; |
| 111 | double y = 0; |
112 | 112 | |
113 | 113 | unsigned cmd; |
114 | 114 | vs.rewind(path_id); |