diff options
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/image.cc | 2 | ||||
| -rw-r--r-- | src/render/jpgfile.cc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/render/image.cc b/src/render/image.cc index e740d56..196eec9 100644 --- a/src/render/image.cc +++ b/src/render/image.cc @@ -62,7 +62,7 @@ void Image::pad() for (size_t y =0; y < h; y++) { memcpy((void *)&image_new[y * image_width * image_channels], - (void *)image_data[y * w * image_channels], (size_t) w); + (void *)&image_data[y * w * image_channels], (size_t) w); } free(image_data); diff --git a/src/render/jpgfile.cc b/src/render/jpgfile.cc index 872233f..7713a07 100644 --- a/src/render/jpgfile.cc +++ b/src/render/jpgfile.cc @@ -18,6 +18,12 @@ http://www.zarb.org/~gc/html/libpng.html #include "render/jpgfile.h" #include "sys/sys.h" +// work around for the win32 build +#ifdef _WIN32 +#ifdef HAVE_STDLIB_H +#undef HAVE_STDLIB_H +#endif +#endif extern "C" { #include "jpeglib.h" } |