Commit Graph

1553 Commits

Author SHA1 Message Date
artemp
813586d1d4 move std.hpp include into image_reader.hpp (g++) 2014-11-19 16:49:26 +01:00
artemp
04cea00d5d return unique_ptr from get_image_reader 2014-11-19 16:31:16 +01:00
artemp
f7e813238d ensure all exceptions are caught in Image ctor 2014-11-19 16:17:52 +01:00
artemp
759a5e65cf simplify image_readers creation implementation
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
2014-11-19 13:06:47 +01:00
Leith Bade
e52cf05ac3 Fix json string crash 2014-11-18 23:34:46 +11:00
Jordan Hollinger
417a156b57 Fix missing semicolon; 2014-11-17 15:53:14 -08:00
artemp
b9ebe16224 correct _nu_tolower/_nu_toupper usage 2014-11-17 18:15:48 +01:00
Leith Bade
80be6c4eb0 Load CA bundle from APK
Remove Assetbridge
2014-11-18 00:33:59 +11:00
Leith Bade
f0e4e27cd3 Read styles from APK 2014-11-17 23:17:22 +11:00
artemp
08357cfcf8 image-readers: only register readers that are used
create_png_reader(char const* data, size_t size)
create_jpeg_reader(char const* data, size_t size)
2014-11-17 12:21:58 +01:00
artemp
9051ae17cf fix png_reader 2014-11-17 11:40:27 +01:00
artemp
66d64c7c12 use nunicode conditional case mapping (lowercase) 2014-11-17 11:22:47 +01:00
Leith Bade
aee724d6cf Create AssetRequest 2014-11-17 20:00:44 +11:00
Leith Bade
d957d65bef Enable PNG gamma 2014-11-16 23:35:15 +11:00
artemp
761b2ba583 simplify factory class to not rely on singleton + cleanups 2014-11-14 12:23:27 +01:00
artemp
e3adc4664b remove unused pragmas 2014-11-14 11:40:35 +01:00
artemp
b62da09cbf fix linux build 2014-11-14 11:26:59 +01:00
artemp
782a0be4bf Merge branch 'master' into image-readers 2014-11-13 15:46:11 +00:00
artemp
9fd9ced956 cleanups 2014-11-13 15:44:03 +00:00
Leith Bade
0dd54c0379 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	platform/default/image.cpp
2014-11-12 23:16:56 +11:00
Konstantin Käfer
27cf24171a check library versions against header symbols in static initialization function
fixes #580
2014-11-12 12:12:01 +01:00
Leith Bade
6b9e3c60ef Renamed source files using mapbox style
Move headers to mbgl/android
Tidy up headers and includes
2014-11-12 21:17:24 +11:00
Leith Bade
de1f37fa9e Change Assetbridge extraction dir to data dir
Only extract needed files
2014-11-11 22:50:37 +11:00
Mike Morris
c542bd1140 repair undef None GLX wrapper, pass 0 instead of None to GLX functions 2014-11-10 15:06:56 -05:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Leith Bade
160712274d Fix Linux build 2014-11-08 13:10:16 +11:00
Leith Bade
c0bcd1e260 Add cache path variable from Java
Use cache path for db location
Add Assetbridge to extract asset files to cache path
Fix SSL by using extracted ca bundle
Use file:// style URL using extracted styles
2014-11-08 12:49:46 +11:00
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Konstantin Käfer
8fe8b2f739 add glx support 2014-11-07 09:38:07 -08:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Leith Bade
f01428b697 Work around gamma crash 2014-11-08 02:14:53 +11:00
Leith Bade
598bc92401 Make image.cpp use Log functions 2014-11-08 01:05:03 +11:00
Leith Bade
7477d0c9df Finish android log backend 2014-11-07 23:46:28 +11:00
artemp
52a7629b35 Merge branch 'master' into image-readers 2014-11-07 11:50:33 +00:00
artemp
f42d39dc6e add image_reader abstraction layer to hanfle multiple image formats
(work-in-progress)
2014-11-07 11:49:31 +00:00
Konstantin Käfer
37afa5af5b explicitly cast to 32 bit integer 2014-11-06 15:40:16 +01:00
Leith Bade
56e26749d4 Start working on android log hook 2014-11-07 01:39:44 +11:00
Konstantin Käfer
01d4cdbb02 clean up poll handle data in close() function so that assert() won't fail 2014-11-06 13:21:46 +01:00
Konstantin Käfer
3303db79d9 fix undefined value
[skip ci]
2014-11-06 13:05:52 +01:00
Konstantin Käfer
3038cdbbf3 fix various issues in curl bindings related to tile cancelation 2014-11-06 13:05:51 +01:00
Leith Bade
fcab29cab0 Fix libuv ifdef bug 2014-11-05 21:11:51 +11:00
Leith Bade
ecda8fb509 Add temporary cache dir. Need to change to Java call. 2014-11-05 20:18:01 +11:00
Konstantin Käfer
0e3f111a79 also use custom formatter for OS X 2014-11-04 16:35:08 +01:00
Konstantin Käfer
75889d8124 replace strftime_l with our custom formatter 2014-11-04 06:44:50 -08:00
artemp
01f70f5db0 increase buf to hold trailing '\0' + better names 2014-11-03 12:29:18 +00:00
artemp
4a5d4ea0aa Merge branch 'master' into nunicode
Conflicts:
	configure
	styles
2014-11-03 10:43:55 +00:00
artemp
318d08706f add <cstring> for std::memset 2014-10-31 15:01:50 -04:00
artemp
ea2416c7cf use nunicode for proper to_upper/to_lower string conversions 2014-10-31 14:43:46 -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
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00