copy changes from develop

This commit is contained in:
Alex Fabijanic
2018-02-02 12:24:16 -06:00
parent 6fa4fda1e4
commit aaf14a0e93
35 changed files with 2376 additions and 238 deletions

View File

@@ -17,7 +17,7 @@
#if defined(POCO_OS_FAMILY_UNIX)
const std::string pdfFileName = "${POCO_BASE}/PDF/samples/Image/Image.pdf";
const std::string pngFileName = "${POCO_BASE}/PDF/samples/Image/logo.PNG";
const std::string pngFileName = "${POCO_BASE}/PDF/samples/Image/logo.png";
#elif defined(POCO_OS_FAMILY_WINDOWS)
const std::string pdfFileName = "%POCO_BASE%/PDF/samples/Image/Image.pdf";
const std::string pngFileName = "%POCO_BASE%/PDF/samples/Image/logo.PNG";