hrev47537 adds 2 changesets to branch 'master' old head: 449f7f5a7b9d381c1eeab3ddfbdba0db0ce05c22 new head: 043178a06317ccc9cd36ceda21bf6c6153986b0f overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=043178a+%5E449f7f5 ---------------------------------------------------------------------------- fe8ce79: Update Web+ bookmark for nightly images Moved from haiku-files to download.haiku-os.org. Thanks to bbjimmy for reporting! 043178a: Add WizzNic * Update sdl_image_x86 to a version that can load PNG files * Update giflib_x86 to match what's required by the new SDL_image package [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ] ---------------------------------------------------------------------------- 5 files changed, 48 insertions(+), 11 deletions(-) build/jam/OptionalPackages | 2 +- build/jam/repositories/HaikuPorts/x86_gcc2 | 10 ++++--- src/system/kernel/posix/xsi_semaphore.cpp | 2 +- src/tests/kits/net/service/UrlTest.cpp | 12 +++++---- src/tests/servers/app/transformation/main.cpp | 33 +++++++++++++++++++++++ ############################################################################ Commit: fe8ce79e16eec117c5ff0bc88e5caa8d0e138237 URL: http://cgit.haiku-os.org/haiku/commit/?id=fe8ce79 Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> Date: Mon Jul 21 06:09:04 2014 UTC Update Web+ bookmark for nightly images Moved from haiku-files to download.haiku-os.org. Thanks to bbjimmy for reporting! ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index cc83ae7..826341e 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -276,7 +276,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { AddPackageFilesToHaikuImage system : webpositive.hpkg : nameFromMetaInfo ; InstallOptionalHaikuImagePackage - $(baseURL)/WebPositiveBookmarks-2014-01-01.zip + $(baseURL)/WebPositiveBookmarks-2014-07-21.zip : home config settings WebPositive ; break ; } ############################################################################ Revision: hrev47537 Commit: 043178a06317ccc9cd36ceda21bf6c6153986b0f URL: http://cgit.haiku-os.org/haiku/commit/?id=043178a Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> Date: Mon Jul 21 06:17:09 2014 UTC Add WizzNic * Update sdl_image_x86 to a version that can load PNG files * Update giflib_x86 to match what's required by the new SDL_image package ---------------------------------------------------------------------------- diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2 index 5807249..fcfc6b4 100644 --- a/build/jam/repositories/HaikuPorts/x86_gcc2 +++ b/build/jam/repositories/HaikuPorts/x86_gcc2 @@ -304,8 +304,8 @@ RemotePackageRepository HaikuPorts gcc_x86-4.8.3_2014_05_28-1 gettext_x86-0.18.1.1-6 gettext_x86_libintl-0.18.1.1-6 - giflib_x86-5.0.5-2 - giflib_x86_devel-5.0.5-2 + giflib_x86-5.1.0-1 + giflib_x86_devel-5.1.0-1 glew_x86-1.10.0-4 glew_x86_devel-1.10.0-4 glew_x86_util-1.10.0-4 @@ -420,8 +420,8 @@ RemotePackageRepository HaikuPorts rocksndiamonds_x86-3.3.1.2-1 sdl_gfx_x86-2.0.24-1 sdl_gfx_x86_devel-2.0.24-1 - sdl_image_x86-1.2.12-1 - sdl_image_x86_devel-1.2.12-1 + sdl_image_x86-1.2.12-3 + sdl_image_x86_devel-1.2.12-3 sdl_net_x86-1.2.8-4 sdl_net_x86_devel-1.2.8-4 sdl_mixer_x86-1.2.12-3 @@ -447,6 +447,7 @@ RemotePackageRepository HaikuPorts tiff_x86-3.9.6-2 tiff_x86_devel-3.9.6-2 vcmi_x86-0.94-1 + wizznic_x86-0.9.9-2 xz_utils_x86-5.0.5-3 xz_utils_x86_devel-5.0.5-3 zlib_x86-1.2.8-4 @@ -647,6 +648,7 @@ RemotePackageRepository HaikuPorts vision wget which + wizznic_x86 wpa_supplicant yab yasm diff --git a/src/system/kernel/posix/xsi_semaphore.cpp b/src/system/kernel/posix/xsi_semaphore.cpp index 1cf30cd..7c14316 100644 --- a/src/system/kernel/posix/xsi_semaphore.cpp +++ b/src/system/kernel/posix/xsi_semaphore.cpp @@ -25,7 +25,7 @@ #include <AutoDeleter.h> -//#define TRACE_XSI_SEM +#define TRACE_XSI_SEM #ifdef TRACE_XSI_SEM # define TRACE(x) dprintf x # define TRACE_ERROR(x) dprintf x diff --git a/src/tests/kits/net/service/UrlTest.cpp b/src/tests/kits/net/service/UrlTest.cpp index d9c789d..1beba92 100644 --- a/src/tests/kits/net/service/UrlTest.cpp +++ b/src/tests/kits/net/service/UrlTest.cpp @@ -185,16 +185,18 @@ const ExplodeTest kTestExplode[] = { "http", "", "", "www.host.tld",0, "/path", "query", "fragment" } }, { "", { "", "", "", "", 0, "", "", ""} }, - { "HTTP://example.com.:80/%70a%74%68?a=%31#1%323", - { "HTTP", "", "", "example.com.",80, "/%70a%74%68","a=%31","1%323"} }, - { "ldap://[2001:db8::7]/c=GB?objectClass?one";, - { "ldap", "", "", "[2001:db8::7]",389,"/c=GB", "objectClass?one", "" } }, { "mailto:John.Doe@xxxxxxxxxxx";, { "mailto", "", "", "", 0, "John.Doe@xxxxxxxxxxx", "", "" } }, { "mailto:?to=addr1@an.example,addr2@an.example";, { "mailto", "", "", "", 0, "", "to=addr1@an.example,addr2@an.example", "" } }, { "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", - { "urn", "", "", "", 0, "oasis:names:specification:docbook:dtd:xml:4.1.2", "", "" } } + { "urn", "", "", "", 0, "oasis:names:specification:docbook:dtd:xml:4.1.2", "", "" } }, + { "http://www.goodsearch.com/login?return_path=/";, + { "http", "", "", "www.goodsearch.com", 0, "/login", "return_path=/", "" } }, + { "ldap://[2001:db8::7]/c=GB?objectClass?one";, + { "ldap", "", "", "[2001:db8::7]",389,"/c=GB", "objectClass?one", "" } }, + { "HTTP://example.com.:80/%70a%74%68?a=%31#1%323", + { "HTTP", "", "", "example.com.",80, "/%70a%74%68","a=%31","1%323"} } }; void UrlTest::ExplodeImplodeTest() diff --git a/src/tests/servers/app/transformation/main.cpp b/src/tests/servers/app/transformation/main.cpp index 26e733d..a206338 100644 --- a/src/tests/servers/app/transformation/main.cpp +++ b/src/tests/servers/app/transformation/main.cpp @@ -492,6 +492,38 @@ public: }; +// #pragma mark - ClippingStates + + +class ClippingStatesTest : public Test { +public: + ClippingStatesTest() + : + Test("Clipping in nested state") + { + } + + virtual void Draw(BView* view, BRect updateRect) + { + BRect r (20, 20, 300, 300); + view->SetHighColor(ui_color(B_FAILURE_COLOR)); + view->FillRect(r); + + BAffineTransform transform; + transform.TranslateBy(20, 0); + view->SetTransform(transform); + + // This should clip to exactly the area we filled red above. + r.OffsetBy(-20, 0); + BRegion clipping(r); + view->ConstrainClippingRegion(&clipping); + + view->SetHighColor(ui_color(B_SUCCESS_COLOR)); + view->FillRect(BRect(-1000, -1000, 1000, 1000)); + } +}; + + // #pragma mark - Clipping @@ -637,6 +669,7 @@ main(int argc, char** argv) window->AddTest(new RectsTest()); window->AddTest(new BitmapClipTest()); + window->AddTest(new ClippingStatesTest()); window->AddTest(new TextClippingTest()); window->AddTest(new AlphaMaskBitmapTest()); window->AddTest(new GradientTest());