rendered paste bodyIndex: okular/generators/dvi/dviexport.cpp
===================================================================
--- okular/generators/dvi/dviexport.cpp (revision 778389)
+++ okular/generators/dvi/dviexport.cpp (working copy)
@@ -398,9 +398,9 @@
{
if (parent.current_page < newFile.total_pages) {
parent.command_pointer =
- newFile.dvi_Data() + parent.dviFile->page_offset[parent.current_page];
+ newFile.dvi_Data() + parent.dviFile->page_offset[(int)parent.current_page];
parent.end_pointer =
- newFile.dvi_Data() + parent.dviFile->page_offset[parent.current_page+1];
+ newFile.dvi_Data() + parent.dviFile->page_offset[(int)parent.current_page+1];
} else {
parent.command_pointer = 0;
parent.end_pointer = 0;
Index: okular/generators/poppler/CMakeLists.txt
===================================================================
--- okular/generators/poppler/CMakeLists.txt (revision 778389)
+++ okular/generators/poppler/CMakeLists.txt (working copy)
@@ -45,7 +45,11 @@
kde4_add_plugin(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS})
-target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore ${KDE4_KIO_LIBS} m )
+if(NOT WIN32)
+ target_link_libraries(okularGenerator_poppler m )
+else(NOT WIN32)
+ target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} fontconfig ${JPEG_LIBRARIES} )
+endif(NOT WIN32)
install(TARGETS okularGenerator_poppler DESTINATION ${PLUGIN_INSTALL_DIR})