[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/krita
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2007-12-09 16:00:09
Message-ID: 1197216009.547509.5300.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 746579 by berger:

port the pdf filter to use poppler 0.6 (patch contributed by Geoff Johnstone)

CCMAIL: geoff.johnstone@googlemail.com

 M  +3 -3      CMakeLists.txt  
 M  +2 -2      pdf/CMakeLists.txt  
 M  +2 -2      pdf/kis_pdf_import.cpp  


--- trunk/koffice/filters/krita/CMakeLists.txt #746578:746579
@@ -14,7 +14,7 @@
 macro_log_feature(PNG_FOUND "png" "The Krita PNG filter will not be built" \
"http://www.libpng.org/pub/png/libpng.html" FALSE "")  \
macro_log_feature(OPENEXR_FOUND "OpenEXR" "The Krita OpenEXR filter will not be \
built" "http://www.openexr.com" FALSE "")  macro_log_feature(GRAPHICSMAGICK_FOUND \
"GraphicsMagick" "The Krita GraphicsMagick filter for various file formats (including \
                PSD, XCF) will not be built" "http://www.graphicsmagick.org" FALSE \
                "")
-macro_log_feature(POPPLER_QT4_FOUND "poppler-qt4" "The Krita PDF filter will not be \
built (version 0.5.x is currently required)" "http://poppler.freedesktop.org" FALSE \
"") +macro_log_feature( HAVE_POPPLER_0_6 "poppler-qt4" "The Krita PDF filter will not \
be built (version 0.6.x is currently required)" "http://poppler.freedesktop.org" \
FALSE "")  
 include_directories(${KRITA_INCLUDES})
 
@@ -45,8 +45,8 @@
 #    add_subdirectory(gmagick)
 endif(GRAPHICSMAGICK_FOUND)
 
-if(POPPLER_QT4_FOUND AND NOT HAVE_POPPLER_0_6)
+if(POPPLER_FOUND AND HAVE_POPPLER_0_6)
     add_subdirectory(pdf)
-endif(POPPLER_QT4_FOUND AND NOT HAVE_POPPLER_0_6)
+endif(POPPLER_FOUND AND HAVE_POPPLER_0_6)
 
 add_subdirectory(bmp)
--- trunk/koffice/filters/krita/pdf/CMakeLists.txt #746578:746579
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_BINARY_DIR}/filters/ ${POPPLER_QT4_INCLUDE_DIR} )
+include_directories( ${CMAKE_BINARY_DIR}/filters/ ${POPPLER_INCLUDE_DIR} )
 
 
 ########### next target ###############
@@ -12,7 +12,7 @@
 
 
 
-target_link_libraries(kritapdfimport kritaui ${POPPLER_QT4_LIBRARIES})
+target_link_libraries(kritapdfimport kritaui ${POPPLER_LIBRARY})
 
 install(TARGETS kritapdfimport  DESTINATION ${PLUGIN_INSTALL_DIR})
 ########### install files ###############
--- trunk/koffice/filters/krita/pdf/kis_pdf_import.cpp #746578:746579
@@ -134,7 +134,7 @@
 
     doc -> prepareForImport();
     // Create the krita image
-    KoColorSpace* cs = KoColorSpaceRegistry::instance()->colorSpace(KoID("RGBA"), \
""); +    const KoColorSpace* cs = \
KoColorSpaceRegistry::instance()->colorSpace(KoID("RGBA"), "");  int width = \
wdg->intWidth->value();  int height = wdg->intHeight->value();
     KisImageSP img = new KisImage(doc->undoAdapter(), width, height, cs, "built \
image"); @@ -144,7 +144,7 @@
     for(QList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it)
     {
         KisPaintLayer* layer = new KisPaintLayer(img.data(), QString(i18n("Page \
                %1")).arg( QString::number(*it) + 1), quint8_MAX);
-        layer->paintDevice()->convertFromQImage( pdoc->page( *it \
)->splashRenderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), ""); \
+        layer->paintDevice()->convertFromQImage( pdoc->page( *it \
)->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), "");  \
img->addLayer(layer, img->rootLayer(), 0);  layer->setDirty();
     }


[prev in list] [next in list] [prev in thread] [next in thread]