diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2017-04-27 15:56:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 15:56:55 -0700 |
| commit | f6e79d70735361438655f279c8699a786d25458c (patch) | |
| tree | cc01ae7aba097bae4aa84beb12ac6b8f34f4d51a /platform/glfw | |
| parent | 839ad87f37a4880804fb4c79157d998ac59954b5 (diff) | |
| download | qtlocation-mapboxgl-f6e79d70735361438655f279c8699a786d25458c.tar.gz | |
[core] Render fill-extrusion layers (#8431)
Diffstat (limited to 'platform/glfw')
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 10 | ||||
| -rw-r--r-- | platform/glfw/main.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index f4ade26885..26c946ed76 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -22,7 +22,7 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_) : fullscreen(fullscreen_), benchmark(benchmark_) { glfwSetErrorCallback(glfwError); - std::srand(std::time(nullptr)); + std::srand(static_cast<unsigned int>(std::time(nullptr))); if (!glfwInit()) { mbgl::Log::Error(mbgl::Event::OpenGL, "failed to initialize glfw"); @@ -542,7 +542,7 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei static GLFWwindow *debugWindow = nullptr; if (!debugWindow) { - debugWindow = glfwCreateWindow(width, height, name.c_str(), nullptr, nullptr); + debugWindow = glfwCreateWindow(static_cast<int>(width), static_cast<int>(height), name.c_str(), nullptr, nullptr); if (!debugWindow) { glfwTerminate(); fprintf(stderr, "Failed to initialize window\n"); @@ -552,7 +552,7 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei GLFWwindow *currentWindow = glfwGetCurrentContext(); - glfwSetWindowSize(debugWindow, width, height); + glfwSetWindowSize(debugWindow, static_cast<int>(width), static_cast<int>(height)); glfwMakeContextCurrent(debugWindow); int fbWidth, fbHeight; @@ -573,7 +573,7 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth static GLFWwindow *debugWindow = nullptr; if (!debugWindow) { - debugWindow = glfwCreateWindow(logicalWidth, logicalHeight, name.c_str(), nullptr, nullptr); + debugWindow = glfwCreateWindow(static_cast<int>(logicalWidth), static_cast<int>(logicalHeight), name.c_str(), nullptr, nullptr); if (!debugWindow) { glfwTerminate(); fprintf(stderr, "Failed to initialize window\n"); @@ -583,7 +583,7 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth GLFWwindow *currentWindow = glfwGetCurrentContext(); - glfwSetWindowSize(debugWindow, logicalWidth, logicalHeight); + glfwSetWindowSize(debugWindow, static_cast<int>(logicalWidth), static_cast<int>(logicalHeight)); glfwMakeContextCurrent(debugWindow); int fbWidth, fbHeight; diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 172b7e3284..59d2ce3ec6 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -199,4 +199,4 @@ int main(int argc, char *argv[]) { view = nullptr; return 0; -} +}
\ No newline at end of file |