[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/okular/generators/poppler
From: Pino Toscano <toscano.pino () tiscali ! it>
Date: 2008-02-11 12:03:28
Message-ID: 1202731408.658220.22770.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 773566 by pino:
merge the checks for stuff in the development version of poppler in a \
HAVE_POPPLER_0_7
M +3 -16 CMakeLists.txt
M +2 -5 config-okular-poppler.h.cmake
M +1 -1 formfields.cpp
M +1 -1 formfields.h
M +3 -3 generator_pdf.cpp
--- trunk/KDE/kdegraphics/okular/generators/poppler/CMakeLists.txt #773565:773566
@@ -1,31 +1,18 @@
-# check for Poppler::PSConverter::setOutputDevice()
+# check for Poppler::FormFieldButton as "0.7 check"
set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}) check_cxx_source_compiles("
#include <poppler-qt4.h>
-int main()
-{
- Poppler::Document * doc = Poppler::Document::load(\"foo\");
- Poppler::PSConverter * psconv = doc->psConverter();
- psconv->setOutputDevice( 0 );
- return 0;
-}
-" POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE)
-macro_bool_to_01(POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE \
_POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE)
-
-check_cxx_source_compiles("
-#include <poppler-qt4.h>
#include <poppler-form.h>
int main()
{
Poppler::FormFieldButton * button = 0;
+ button->buttonType();
return 0;
}
-" POPPLER_HAVE_FORMFIELDBUTTON)
-macro_bool_to_01(POPPLER_HAVE_FORMFIELDBUTTON _POPPLER_HAVE_FORMFIELDBUTTON)
+" HAVE_POPPLER_0_7)
-
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h
--- trunk/KDE/kdegraphics/okular/generators/poppler/config-okular-poppler.h.cmake \
#773565:773566 @@ -1,8 +1,5 @@
/* Defined if we have the 0.6 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_6 1
-/* Defined if Poppler::PSConverter has setOutputDevice */
-#define POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE \
${_POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE}
-
-/* Defined if Poppler::FormFieldButton is available */
-#define POPPLER_HAVE_FORMFIELDBUTTON ${_POPPLER_HAVE_FORMFIELDBUTTON}
+/* Defined if we have the 0.7 version of the Poppler library */
+#cmakedefine HAVE_POPPLER_0_7 1
--- trunk/KDE/kdegraphics/okular/generators/poppler/formfields.cpp #773565:773566
@@ -9,7 +9,7 @@
#include "formfields.h"
-#ifdef POPPLER_HAVE_FORMFIELDBUTTON
+#ifdef HAVE_POPPLER_0_7
PopplerFormFieldButton::PopplerFormFieldButton( Poppler::FormFieldButton * field )
: Okular::FormFieldButton(), m_field( field )
{
--- trunk/KDE/kdegraphics/okular/generators/poppler/formfields.h #773565:773566
@@ -15,7 +15,7 @@
#include <config-okular-poppler.h>
-#ifdef POPPLER_HAVE_FORMFIELDBUTTON
+#ifdef HAVE_POPPLER_0_7
class PopplerFormFieldButton : public Okular::FormFieldButton
{
public:
--- trunk/KDE/kdegraphics/okular/generators/poppler/generator_pdf.cpp #773565:773566
@@ -874,7 +874,7 @@
#ifdef HAVE_POPPLER_0_6
-#if POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE
+#if HAVE_POPPLER_0_7
tf.setAutoRemove(false);
#else
tf.close();
@@ -890,7 +890,7 @@
Poppler::PSConverter *psConverter = pdfdoc->psConverter();
-#if POPPLER_HAVE_PSCONVERTER_SETOUTPUTDEVICE
+#if HAVE_POPPLER_0_7
psConverter->setOutputDevice(&tf);
#else
psConverter->setOutputFileName(tempfilename);
@@ -1386,7 +1386,7 @@
Okular::FormField * of = 0;
switch ( f->type() )
{
-#ifdef POPPLER_HAVE_FORMFIELDBUTTON
+#ifdef HAVE_POPPLER_0_7
case Poppler::FormField::FormButton:
of = new PopplerFormFieldButton( \
static_cast<Poppler::FormFieldButton*>( f ) ); break;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic