Leith Bade
|
cfb6e2752c
|
Fix Linux build
|
2014-12-02 20:04:12 +11:00 |
|
Leith Bade
|
2b86522412
|
Share asset_request between platforms
|
2014-12-02 19:41:50 +11:00 |
|
Leith Bade
|
9a8c018a32
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
|
2014-12-02 19:05:05 +11:00 |
|
Leith Bade
|
42966004f3
|
Merge pull request #670 from mapbox/gl-debug
Use GL debug callbacks
|
2014-12-02 19:02:16 +11:00 |
|
Mike Morris
|
7e7b85e132
|
fix memcpy includes/namespace
|
2014-12-01 13:49:47 -08:00 |
|
Mike Morris
|
0fd7f26533
|
move pixel flip from headless test into HeadlessView::readPixels
|
2014-12-01 16:36:11 -05:00 |
|
Leith Bade
|
2800f36142
|
Add debug markers and labels
|
2014-12-02 03:24:42 +11:00 |
|
Leith Bade
|
66349e33ab
|
Add GL_ARB_debug_output
|
2014-12-02 03:09:09 +11:00 |
|
Leith Bade
|
6998c6ecb9
|
Load KHR_debug on Linux
|
2014-12-02 00:44:08 +11:00 |
|
Leith Bade
|
c8552e1b28
|
Fix VAOs on Linux
|
2014-12-02 00:05:45 +11:00 |
|
Leith Bade
|
e5317b5237
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
|
2014-11-30 12:17:52 +11:00 |
|
artemp
|
2586cfb9e3
|
use ``const var&`` notation in public interface
|
2014-11-27 18:11:18 +01:00 |
|
Leith Bade
|
8ae2cd3985
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
README.md
configure
gyp/mbgl-linux.gypi
include/mbgl/map/map.hpp
include/mbgl/platform/default/image_reader.hpp
include/mbgl/platform/default/jpeg_reader.hpp
include/mbgl/platform/default/png_reader.hpp
include/mbgl/util/uv_detail.hpp
ios/mapbox-gl-cocoa
platform/default/image.cpp
platform/default/image_reader.cpp
platform/default/jpeg_reader.cpp
platform/default/png_reader.cpp
src/map/map.cpp
|
2014-11-28 01:51:21 +11:00 |
|
artemp
|
6d62aad0ed
|
image_readers: premultiply alpha
|
2014-11-28 00:15:05 +11:00 |
|
artemp
|
fc805cc41c
|
image-readers: move concrete implementations headers into platform/default
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
3f8efa6985
|
move std.hpp include into image_reader.hpp (g++)
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
8c524e1ac6
|
return unique_ptr from get_image_reader
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
a2a303a1d1
|
ensure all exceptions are caught in Image ctor
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
fcebd44571
|
simplify image_readers creation implementation
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
33cc51c1d2
|
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-28 00:15:04 +11:00 |
|
artemp
|
34d9d55846
|
fix png_reader
|
2014-11-28 00:15:04 +11:00 |
|
artemp
|
15973741d5
|
simplify factory class to not rely on singleton + cleanups
|
2014-11-28 00:14:15 +11:00 |
|
artemp
|
46e9d46028
|
remove unused pragmas
|
2014-11-28 00:14:15 +11:00 |
|
artemp
|
447bec6281
|
fix linux build
|
2014-11-28 00:14:15 +11:00 |
|
artemp
|
0a532cc420
|
cleanups
|
2014-11-28 00:14:15 +11:00 |
|
artemp
|
ae2d4e740e
|
add image_reader abstraction layer to hanfle multiple image formats
(work-in-progress)
|
2014-11-28 00:14:11 +11:00 |
|
artemp
|
8f3d2d4a45
|
Merge branch 'master' into nunicode
|
2014-11-27 11:43:13 +01:00 |
|
artemp
|
84551d9349
|
convert image_reader public interface to use CamelCase to match the rest of codebase
|
2014-11-26 17:50:12 +01:00 |
|
artemp
|
4af232dcf3
|
image_readers: premultiply alpha
|
2014-11-21 11:28:56 +01:00 |
|
artemp
|
f89c9753dd
|
image-readers: move concrete implementations headers into platform/default
|
2014-11-19 16:56:53 +01:00 |
|
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 |
|
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
|
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 |
|