Index: CMakeLists.txt --- CMakeLists.txt.orig 2015-07-22 11:31:40.000000000 +0200 +++ CMakeLists.txt 2015-08-28 13:50:37.115684926 +0200 @@ -213,7 +213,7 @@ ${CMAKE_SOURCE_DIR}/share/pdf2htmlEX-64x64.png ) install (FILES ${PDF2HTMLEX_RESOURCE} DESTINATION share/pdf2htmlEX) -install (FILES pdf2htmlEX.1 DESTINATION share/man/man1) +install (FILES pdf2htmlEX.1 DESTINATION man/man1) enable_testing() add_test(test python ${CMAKE_SOURCE_DIR}/test/test.py) Index: src/HTMLRenderer/form.cc --- src/HTMLRenderer/form.cc.orig 2015-07-22 11:31:40.000000000 +0200 +++ src/HTMLRenderer/form.cc 2015-08-28 13:48:02.335705697 +0200 @@ -15,6 +15,15 @@ #include "util/namespace.h" #include "util/misc.h" +#include +#include + +template std::string my_to_string(const T& n) { + std::ostringstream stm; + stm << n; + return stm.str(); +} + namespace pdf2htmlEX { using std::ofstream; @@ -48,8 +57,8 @@ << "\" type=\"text\" value=\"\"" << " style=\"position: absolute; left: " << x1 << "px; bottom: " << y1 << "px;" - << " width: " << width << "px; height: " << std::to_string(height) - << "px; line-height: " << std::to_string(height) << "px; font-size: " + << " width: " << width << "px; height: " << my_to_string(height) + << "px; line-height: " << my_to_string(height) << "px; font-size: " << font_size << "px;\" />" << endl; } else if(w->getType() == formButton) @@ -64,7 +73,7 @@ << "\" style=\"position: absolute; left: " << x1 << "px; bottom: " << y1 << "px;" << " width: " << width << "px; height: " - << std::to_string(height) << "px; background-size: cover;\" >" << endl; + << my_to_string(height) << "px; background-size: cover;\" >" << endl; } else { Index: src/util/const.h --- src/util/const.h.orig 2015-07-22 11:31:40.000000000 +0200 +++ src/util/const.h 2015-08-28 13:48:02.335705697 +0200 @@ -16,7 +16,7 @@ namespace pdf2htmlEX { #ifndef nullptr -#define nullptr (NULL) +#define nullptr (0) #endif static const double EPS = 1e-6;