diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-18 16:33:39 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-18 16:33:39 +1100 |
| commit | 016c2948c5e5d0f49c6169bd5802b54747c60312 (patch) | |
| tree | 0bc1c8968ddf78e26ed21f8dd1217873bad3c2da /test | |
| parent | 4540a8ae83fb219e1166d31ebd3cbbe1f2937993 (diff) | |
| parent | 9b2c8d0391a0f06d65e34a87279973d191035015 (diff) | |
| download | qtlocation-mapboxgl-016c2948c5e5d0f49c6169bd5802b54747c60312.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/map/map.cpp
Diffstat (limited to 'test')
| -rw-r--r-- | test/headless.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/headless.cpp b/test/headless.cpp index dfa649da5d..86960fb08b 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -190,8 +190,8 @@ TEST_P(HeadlessTest, render) { CachingHTTPFileSource fileSource(platform::defaultCacheDatabase()); Map map(view, fileSource); + map.setClasses(classes); map.setStyleJSON(style, base_directory); - map.setAppliedClasses(classes); view.resize(width, height, pixelRatio); map.resize(width, height, pixelRatio); |