Commit Graph

163 Commits

Author SHA1 Message Date
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -04:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -04:00
Konstantin Käfer
86230821e4 use test suite as submodule instead of using npm 2014-10-31 12:02:39 -04:00
Konstantin Käfer
8dda6482fa fix image y reversal 2014-10-30 15:56:17 -04:00
Konstantin Käfer
930d063259 Merge branch 'master' into platform-image
Conflicts:
	gyp/install.gypi
2014-10-30 15:44:09 -04:00
Konstantin Käfer
592ed57d09 use more modern libpng version instead of the system-provided one and fix compile errors 2014-10-30 12:40:16 -07:00
Dane Springmeyer
c40a85587b attemp to fix #525 2014-10-30 13:37:10 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
Dane Springmeyer
152545d33a fix xtest target - closes #520 - longer term fix at #519 2014-10-30 11:24:28 -04:00
Dane Springmeyer
d8a93dbb95 use stable cross-generator direction for referencing standalone lib + other minor fixups 2014-10-29 18:13:25 -04:00
Dane Springmeyer
cefa3462f8 linux test build fixes 2014-10-29 16:34:53 -04:00
Dane Springmeyer
1069e3b4e9 fix tests 2014-10-29 16:29:48 -04:00
Konstantin Käfer
293b291b80 rename mbgl to mbgl-core 2014-10-29 11:59:24 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Konstantin Käfer
84700fce90 allow installing the library 2014-10-27 10:12:30 -04:00
Konstantin Käfer
0e928b5204 make tests work 2014-10-24 17:44:51 +02:00
Konstantin Käfer
d299e58088 Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
Conflicts:
	Makefile
	ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a restructure gyp files 2014-10-24 16:40:08 +02:00
Konstantin Käfer
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
20ea7ef104 remove erroneous output during test run 2014-10-22 16:30:06 +02:00
Konstantin Käfer
7d6feffd56 replace boost optional with mapbox optional 2014-10-22 16:29:10 +02:00
Konstantin Käfer
087d04292a Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-22 15:18:30 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
253bbd1c5b New mason-based build system 2014-10-22 15:13:35 +02:00
Konstantin Käfer
c6e4cf2f80 use ASSERT_FALSE for boolean comparisons 2014-10-22 04:20:51 -07:00
Konstantin Käfer
2f3952b305 fix compile warnings 2014-10-22 11:00:34 +02:00
Konstantin Käfer
b9d422ebc3 use glfw3 libs instead of manually linking OpenGL frameworks on OS X
[skip ci]
2014-10-22 10:45:50 +02:00
John Firebaugh
4e9688e430 Fix compiler warnings 2014-10-17 11:12:31 -07:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
2014-10-10 12:24:45 -04:00
Mike Morris
dfb81fe9ce fix HeadlessView::readPixels return value, ref #480 2014-10-08 16:04:19 -04:00
Mike Morris
a1bc8c766d add HeadlessView::readPixels, fixes #480 2014-10-08 15:31:41 -04:00
Mike Morris
36b7bb0c09 clean up shared_ptr usage in HeadlessView 2014-10-07 16:26:21 -04:00
Mike Morris
0f1d33f5ee break out HeadlessDisplay from HeadlessView, ref #478 2014-10-03 18:31:38 -04:00
Konstantin Käfer
8fcc74e253 fix headless tests 2014-09-30 17:29:10 +02:00
Mike Morris
3dec4933a9 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
Conflicts:
	common/headless_view.cpp
	test/headless.cpp
2014-09-24 15:58:52 -04:00
Mike Morris
8a19896c3a Merge branch 'master' into libuv010 2014-09-24 15:40:08 -04:00
John Firebaugh
4b98870e99 Support pixelRatio parameter for render tests 2014-09-22 14:05:15 -07:00
Mike Morris
65df83ce4c bump mapnik-packaging, remove unnecessary view.make_active calls 2014-09-19 16:16:44 -04:00
Mike Morris
6b23d05a23 remove debugging 2014-09-02 17:48:34 -04:00
Mike Morris
b18cf767c0 use std::fopen/std::fread instead of libuv, thanks @springmeyer 2014-09-02 17:30:35 -04:00
Mike Morris
a8021e84f8 Merge branch 'master' into libuv010 2014-08-29 15:43:13 -04:00
John Firebaugh
20762ee9f4 Use fresh map and view for each test 2014-08-28 13:09:15 -07:00
Mike Morris
81c9615122 more fixes for libuv v0.10 2014-08-27 15:58:06 -04:00
Konstantin Käfer
953e5524a9 fix basepath for headless stylesheets 2014-08-27 14:28:56 +02:00
Konstantin Käfer
5b4ad90bac Merge pull request #445 from mapbox/nsstring
Use NSString-specific case change functions on OS X/iOS
2014-08-26 17:43:02 +02:00
Konstantin Käfer
0f73a0192e Merge pull request #439 from mapbox/clipping
Compute unique clip IDSs per tile
2014-08-26 17:42:53 +02:00
John Firebaugh
3b43c4ddf2 Fix headless tests 2014-08-22 11:17:34 -07:00