summaryrefslogtreecommitdiff
path: root/plugingui
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-11-21 15:39:30 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2015-11-21 15:39:30 +0100
commit147cc6b685384d95515205b9e2ac1400c27e3d4f (patch)
tree2b3d66120d68f474b18861eb38e44158b80b8c4f /plugingui
parent2a7259164b887dec945d1cdf98737853152b79cf (diff)
Fix includes.
Diffstat (limited to 'plugingui')
-rw-r--r--plugingui/image.cc5
-rw-r--r--plugingui/nativewindow_win32.cc2
2 files changed, 4 insertions, 3 deletions
diff --git a/plugingui/image.cc b/plugingui/image.cc
index 52c5c9f..3cefbb3 100644
--- a/plugingui/image.cc
+++ b/plugingui/image.cc
@@ -28,6 +28,7 @@
#include <cstring>
#include <cstdint>
+#include <cstdlib>
#include <hugin.hpp>
@@ -49,7 +50,7 @@ Image::Image(const std::string& filename)
Image::~Image()
{
- free(image_data);
+ std::free(image_data);
}
void Image::setError()
@@ -70,7 +71,7 @@ void Image::setError()
_height = ih;
size_t image_size = rc.size() - (sizeof(iw) + sizeof(ih));
- image_data = (unsigned char*)malloc(image_size);
+ image_data = (unsigned char*)std::malloc(image_size);
memcpy(image_data, p, image_size);
}
diff --git a/plugingui/nativewindow_win32.cc b/plugingui/nativewindow_win32.cc
index e9f37a7..cce5a49 100644
--- a/plugingui/nativewindow_win32.cc
+++ b/plugingui/nativewindow_win32.cc
@@ -312,7 +312,7 @@ NativeWindowWin32::NativeWindowWin32(Window& window)
wcex.hbrBackground = nullptr;//(HBRUSH) COLOR_BACKGROUND + 1;
// }
- wcex.lpszClassName = m_className = strdup("DrumGizmoClass");
+ wcex.lpszClassName = m_className = (char*)"DrumGizmoClass";
RegisterClassEx(&wcex);