Dane Springmeyer
|
b42c2b55e3
|
[build] shuffle boost_regex linking again
|
2014-05-30 19:20:33 -07:00 |
|
Dane Springmeyer
|
71254dccad
|
Merge pull request #292 from mapbox/boost-regex
Boost regex
|
2014-05-30 18:17:18 -07:00 |
|
Nicki Dlugash
|
39bc0fb247
|
fixed night marine label stroke color
|
2014-05-30 21:13:13 -04:00 |
|
Nicki Dlugash
|
1314542e6e
|
Merge pull request #290 from mapbox/marine-labels
revamped all marine labels
|
2014-05-30 21:09:23 -04:00 |
|
Dane Springmeyer
|
18c0813346
|
[build] move regex linking to llmr.gyp
|
2014-05-30 17:41:54 -07:00 |
|
Nicki Dlugash
|
780e7b1b2a
|
revamped all marine labels
|
2014-05-30 20:27:23 -04:00 |
|
Dane Springmeyer
|
f291d609f4
|
[build] linux app needs to link to regex
|
2014-05-30 17:20:23 -07:00 |
|
Dane Springmeyer
|
3289009584
|
use boost::regex on linux - refs #286
|
2014-05-30 16:45:13 -07:00 |
|
Nicki Dlugash
|
6fd1525335
|
Merge pull request #288 from mapbox/label-styles-line-break
Label styles line break
|
2014-05-30 19:26:34 -04:00 |
|
Nicki Dlugash
|
1d8c40870f
|
maxWidth for country, place, and water labels
|
2014-05-30 18:54:43 -04:00 |
|
Nicki Dlugash
|
600acd89ac
|
changed all labels to name_en
|
2014-05-30 17:52:07 -04:00 |
|
Nicki Dlugash
|
49dac9bfba
|
added new style properties to largest marine labels
|
2014-05-30 17:46:42 -04:00 |
|
Dane Springmeyer
|
62430f7b1b
|
[travis] scrap attempt at using libc++ which is only packaged for > trusty - refs #287
|
2014-05-30 14:15:27 -07:00 |
|
Nicki Dlugash
|
62c7eab83d
|
tweaked hillshade opacities
|
2014-05-30 17:04:59 -04:00 |
|
Dane Springmeyer
|
3dd5d4cd24
|
add 'make setup' target a simplier way to get started than running ./setup-libraries.sh
|
2014-05-30 13:56:48 -07:00 |
|
Dane Springmeyer
|
b24dc07fdd
|
[travis] build with libc++ when building with clang++ - refs #287
|
2014-05-30 13:44:25 -07:00 |
|
Dane Springmeyer
|
5f03cc1595
|
[hardening] fix double const& declaration
|
2014-05-30 13:41:07 -07:00 |
|
Dane Springmeyer
|
42a2c252b8
|
use malloc/free from c++: fixes compile with libc++ on linux - refs #287
|
2014-05-30 13:38:09 -07:00 |
|
Dane Springmeyer
|
78ad025973
|
[travis] -Wno-unknown-pragmas
|
2014-05-30 13:28:37 -07:00 |
|
Dane Springmeyer
|
74c534b07a
|
avoid unused variable warning
|
2014-05-30 13:28:06 -07:00 |
|
Dane Springmeyer
|
a944018367
|
[hardening] must return from non void function
|
2014-05-30 13:27:48 -07:00 |
|
Dane Springmeyer
|
7adbc8371f
|
[hardening] avoid accessing potentially uninitialized memory
|
2014-05-30 13:26:59 -07:00 |
|
Nicki Dlugash
|
7257bbe8ad
|
reduce to three font stacks and updates to compensate
|
2014-05-30 16:23:33 -04:00 |
|
Nicki Dlugash
|
4f6e2fcd2a
|
contour labels and waterway label style updates
|
2014-05-30 16:19:04 -04:00 |
|
Dane Springmeyer
|
d19870d9d2
|
fix another potential invalid memory access
|
2014-05-30 12:41:41 -07:00 |
|
Nicki Dlugash
|
2af43684b2
|
Merge branch 'master' into label-styles-line-break
|
2014-05-30 15:40:40 -04:00 |
|
Dane Springmeyer
|
552b9a0f1b
|
fix potential crash in line wrapping:
- shaping.size() == 0 would result in unsigned overflow because uint32_t(0) - 1 == huge number
|
2014-05-30 12:35:49 -07:00 |
|
Konstantin Käfer
|
c5fd7a0cdd
|
add token replacement system
fixes #212
|
2014-05-30 21:13:55 +02:00 |
|
Konstantin Käfer
|
da29a16370
|
skip second loop
|
2014-05-30 21:13:55 +02:00 |
|
Dane Springmeyer
|
7124580294
|
fix function signature
|
2014-05-30 12:13:26 -07:00 |
|
Dane Springmeyer
|
8edf4a7796
|
[build] debug back to -O0 to ensure fullest symbol visibility
|
2014-05-30 11:54:28 -07:00 |
|
Nicki Dlugash
|
42d9e37911
|
Merge branch 'master' into label-styles-line-break
|
2014-05-30 14:37:05 -04:00 |
|
Nicki Dlugash
|
aedb8dbb90
|
fixed poi translate
|
2014-05-30 14:36:33 -04:00 |
|
Dane Springmeyer
|
925c64d906
|
gitignore cleanup after build improvements
|
2014-05-30 11:29:47 -07:00 |
|
Dane Springmeyer
|
c83aac0518
|
[build] remove obsolete clean targets + add fuller distclean ops
|
2014-05-30 11:25:45 -07:00 |
|
Nicki Dlugash
|
eb394de325
|
Merge branch 'master' into label-styles-line-break
Conflicts:
bin/style.js
|
2014-05-30 14:22:16 -04:00 |
|
Nicki Dlugash
|
afc72ee055
|
removed translate property from poi label classes, added to bucket
|
2014-05-30 14:19:45 -04:00 |
|
Mike Morris
|
59774f7e93
|
shaped to shaping, pass by reference instead of returning a copy
|
2014-05-30 14:19:22 -04:00 |
|
Nicki Dlugash
|
3ba2002c49
|
poi label size refinement
|
2014-05-30 14:13:13 -04:00 |
|
Dane Springmeyer
|
de1fa07bc6
|
fix travis link in readme [skip ci]
|
2014-05-30 10:53:07 -07:00 |
|
Dane Springmeyer
|
e69ec277ec
|
[build] on osx accept either libtool or glibtool
|
2014-05-30 10:26:30 -07:00 |
|
Ansis Brammanis
|
0dd78c96e3
|
Merge remote-tracking branch 'origin/linebreak'
|
2014-05-30 13:06:25 -04:00 |
|
Ansis Brammanis
|
c0c43ef518
|
fix compile error
|
2014-05-30 13:06:08 -04:00 |
|
Konstantin Käfer
|
d5e63cea21
|
retain the uv loop until all things deconstructed
fixes #261
|
2014-05-30 17:32:09 +02:00 |
|
Konstantin Käfer
|
78fda8bb62
|
make sure we retain shared state when destructing the map object
refs #261
|
2014-05-30 17:00:47 +02:00 |
|
Young Hahn
|
2d0b3482ec
|
Merge branch 'master' into linebreak
Conflicts:
src/map/tile_parser.cpp
src/text/glyph_store.cpp
|
2014-05-30 09:00:29 -04:00 |
|
Konstantin Käfer
|
3e7f801de1
|
mark all sprites as uninitialized on pixelRatio changes
fixes #226
|
2014-05-30 14:28:42 +02:00 |
|
Konstantin Käfer
|
3a8b88dbbd
|
fix nearest neighbor image scaling
refs #226
|
2014-05-30 14:26:26 +02:00 |
|
Konstantin Käfer
|
31d9dbefea
|
pass shaping directly instead of looking it up
|
2014-05-30 14:01:53 +02:00 |
|
Konstantin Käfer
|
461a19dfa2
|
fallback to default properties instead of not rendering when we don't have a style
refs #272
|
2014-05-30 13:36:53 +02:00 |
|