[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: test_app_server: fix build
From: Gerrit <review () review ! haiku-os ! org>
Date: 2022-07-24 23:30:58
Message-ID: 1e6f163c336d204cf3114c8273709b9da1ec66a9-HTML () review ! haiku-os ! org
[Download RAW message or body]
From John Scipione <jscipione@gmail.com>:
John Scipione has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/5504 )
Change subject: test_app_server: fix build
......................................................................
test_app_server: fix build
test_app_server: fix build for SVGViewView.cpp
src/tests/kits/interface/picture/SVGViewView.cpp:
In method `struct rgb_color Svg2PictureView::GetColorAttribute(const
XML_Char **, const char *, unsigned char)':
src/tests/kits/interface/picture/SVGViewView.cpp:258:
warning: unsigned int format, long unsigned int arg (arg 3)
src/tests/kits/interface/picture/SVGViewView.cpp:258:
warning: unsigned int format, long unsigned int arg (arg 4)
src/tests/kits/interface/picture/SVGViewView.cpp:258:
warning: unsigned int format, long unsigned int arg (arg 5)
src/tests/kits/interface/picture/SVGViewView.cpp:264:
warning: unsigned int format, long unsigned int arg (arg 3)
src/tests/kits/interface/picture/SVGViewView.cpp:264:
warning: unsigned int format, long unsigned int arg (arg 4)
src/tests/kits/interface/picture/SVGViewView.cpp:264:
warning: unsigned int format, long unsigned int arg (arg 5)
src/tests/kits/interface/picture/SVGViewView.cpp:276:
warning: int format, int32 arg (arg 3)
src/tests/kits/interface/picture/SVGViewView.cpp:276:
warning: int format, int32 arg (arg 4)
src/tests/kits/interface/picture/SVGViewView.cpp:276:
warning: int format, int32 arg (arg 5)
Change-Id: I886cef4df7f47425db8ee22ec1271d122cb454ea
test_app_server: fix build for ScreenManager.cpp
src/servers/app/ScreenManager.cpp:206: parse error before `('
Change-Id: I83edbc3059d6042482820a43eb41ef16928b8f6b
---
M src/servers/app/ScreenManager.cpp
M src/servers/app/drawing/interface/virtual/DWindowBuffer.h
M src/tests/kits/interface/picture/SVGViewView.cpp
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/04/5504/1
diff --git a/src/servers/app/ScreenManager.cpp b/src/servers/app/ScreenManager.cpp
index c220ff3..afd2d0b 100644
--- a/src/servers/app/ScreenManager.cpp
+++ b/src/servers/app/ScreenManager.cpp
@@ -201,6 +201,7 @@
// ToDo: to make monitoring the driver directory useful, we need more
// power and data here, and should do the scanning on our own
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
bool initDrivers = true;
while (initDrivers) {
interface = new AccelerantHWInterface();
@@ -208,6 +209,7 @@
_AddHWInterface(interface);
initDrivers = false;
}
+#endif
}
diff --git a/src/servers/app/drawing/interface/virtual/DWindowBuffer.h \
b/src/servers/app/drawing/interface/virtual/DWindowBuffer.h index 0c878eb..a2d93da \
100644
--- a/src/servers/app/drawing/interface/virtual/DWindowBuffer.h
+++ b/src/servers/app/drawing/interface/virtual/DWindowBuffer.h
@@ -32,6 +32,7 @@
BRegion& WindowClipping()
{ return fWindowClipping; }
+
private:
uint8* fBits;
uint32 fWidth;
diff --git a/src/tests/kits/interface/picture/SVGViewView.cpp \
b/src/tests/kits/interface/picture/SVGViewView.cpp index bac96e6..50975ab 100644
--- a/src/tests/kits/interface/picture/SVGViewView.cpp
+++ b/src/tests/kits/interface/picture/SVGViewView.cpp
@@ -251,7 +251,7 @@
if (!attr)
return colors[0].color;
- int32 red, green, blue;
+ int red, green, blue;
if (attr[0] == '#') {
if (strlen(attr) == 4) {
--
To view, visit https://review.haiku-os.org/c/haiku/+/5504
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I83edbc3059d6042482820a43eb41ef16928b8f6b
Gerrit-Change-Number: 5504
Gerrit-PatchSet: 1
Gerrit-Owner: John Scipione <jscipione@gmail.com>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>John Scipione has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/5504">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">test_app_server: fix \
build<br><br>test_app_server: fix build for \
SVGViewView.cpp<br><br>src/tests/kits/interface/picture/SVGViewView.cpp:<br>In method \
`struct rgb_color Svg2PictureView::GetColorAttribute(const<br>XML_Char **, const char \
*, unsigned char)':<br>src/tests/kits/interface/picture/SVGViewView.cpp:258:<br>warning: \
unsigned int format, long unsigned int arg (arg \
3)<br>src/tests/kits/interface/picture/SVGViewView.cpp:258:<br>warning: unsigned int \
format, long unsigned int arg (arg \
4)<br>src/tests/kits/interface/picture/SVGViewView.cpp:258:<br>warning: unsigned int \
format, long unsigned int arg (arg \
5)<br>src/tests/kits/interface/picture/SVGViewView.cpp:264:<br>warning: unsigned int \
format, long unsigned int arg (arg \
3)<br>src/tests/kits/interface/picture/SVGViewView.cpp:264:<br>warning: unsigned int \
format, long unsigned int arg (arg \
4)<br>src/tests/kits/interface/picture/SVGViewView.cpp:264:<br>warning: unsigned int \
format, long unsigned int arg (arg \
5)<br>src/tests/kits/interface/picture/SVGViewView.cpp:276:<br>warning: int format, \
int32 arg (arg 3)<br>src/tests/kits/interface/picture/SVGViewView.cpp:276:<br>warning: \
int format, int32 arg (arg \
4)<br>src/tests/kits/interface/picture/SVGViewView.cpp:276:<br>warning: int format, \
int32 arg (arg 5)<br><br>Change-Id: \
I886cef4df7f47425db8ee22ec1271d122cb454ea<br><br>test_app_server: fix build for \
ScreenManager.cpp<br><br>src/servers/app/ScreenManager.cpp:206: parse error before \
`('<br><br>Change-Id: I83edbc3059d6042482820a43eb41ef16928b8f6b<br>---<br>M \
src/servers/app/ScreenManager.cpp<br>M \
src/servers/app/drawing/interface/virtual/DWindowBuffer.h<br>M \
src/tests/kits/interface/picture/SVGViewView.cpp<br>3 files changed, 4 insertions(+), \
1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: \
pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku refs/changes/04/5504/1</pre><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git \
a/src/servers/app/ScreenManager.cpp \
b/src/servers/app/ScreenManager.cpp</span><br><span>index c220ff3..afd2d0b \
100644</span><br><span>--- a/src/servers/app/ScreenManager.cpp</span><br><span>+++ \
b/src/servers/app/ScreenManager.cpp</span><br><span>@@ -201,6 +201,7 \
@@</span><br><span> // ToDo: to make monitoring the driver directory useful, we need \
more</span><br><span> // power and data here, and should do the scanning on our \
own</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef \
HAIKU_TARGET_PLATFORM_LIBBE_TEST</span><br><span> bool initDrivers = \
true;</span><br><span> while (initDrivers) {</span><br><span> interface = new \
AccelerantHWInterface();</span><br><span>@@ -208,6 +209,7 @@</span><br><span> \
_AddHWInterface(interface);</span><br><span> initDrivers = false;</span><br><span> \
}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> \
}</span><br><span> </span><br><span> </span><br><span>diff --git \
a/src/servers/app/drawing/interface/virtual/DWindowBuffer.h \
b/src/servers/app/drawing/interface/virtual/DWindowBuffer.h</span><br><span>index \
0c878eb..a2d93da 100644</span><br><span>--- \
a/src/servers/app/drawing/interface/virtual/DWindowBuffer.h</span><br><span>+++ \
b/src/servers/app/drawing/interface/virtual/DWindowBuffer.h</span><br><span>@@ -32,6 \
+32,7 @@</span><br><span> </span><br><span> \
BRegion& WindowClipping()</span><br><span> { return fWindowClipping; \
}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> \
private:</span><br><span> uint8* fBits;</span><br><span> \
uint32 fWidth;</span><br><span>diff --git \
a/src/tests/kits/interface/picture/SVGViewView.cpp \
b/src/tests/kits/interface/picture/SVGViewView.cpp</span><br><span>index \
bac96e6..50975ab 100644</span><br><span>--- \
a/src/tests/kits/interface/picture/SVGViewView.cpp</span><br><span>+++ \
b/src/tests/kits/interface/picture/SVGViewView.cpp</span><br><span>@@ -251,7 +251,7 \
@@</span><br><span> if (!attr)</span><br><span> return \
colors[0].color;</span><br><span> </span><br><span style="color: hsl(0, 100%, \
40%);">- int32 red, green, blue;</span><br><span style="color: hsl(120, 100%, \
40%);">+ int red, green, blue;</span><br><span> </span><br><span> if (attr[0] == \
'#') {</span><br><span> if (strlen(attr) == 4) \
{</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/5504">change 5504</a>. To unsubscribe, or \
for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/5504"/><meta itemprop="name" \
content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I83edbc3059d6042482820a43eb41ef16928b8f6b </div> <div style="display:none"> \
Gerrit-Change-Number: 5504 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: John Scipione \
<jscipione@gmail.com> </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic