office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

- the fax library and its generator compile and link correctly

Browse source 
- less kde3 support
- small fix in the top CMakeLists.txt

svn path=/branches/work/kde4/playground/graphics/okular/; revision=524044
This commit is contained in:
Pino Toscano 2006-03-29 15:50:33 +00:00
parent 0b29b076b8
commit a536c798f2
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -66,7 +66,7 @@ set(oKularcore_SRCS ${oKularconf_SRCS} ${oKularcore_SRCS} )
kde4_automoc(${oKularcore_SRCS})
kde4_add_plugin(oKularcore WITH_PREFIX ${oKularcore_SRCS})
kde4_add_library(oKularcore SHARED ${oKularcore_SRCS})
target_link_libraries(oKularcore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} m )

4
generators/fax/CMakeLists.txt
View file

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( libkfaximage )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular ${CMAKE_BINARY_DIR}/okular ${CMAKE_SOURCE_DIR}/okular/generators/fax/libkfaximage )
########### next target ###############
@ -15,7 +15,7 @@ kde4_add_plugin(okularGenerator_fax WITH_PREFIX ${okularGenerator_fax_PART_SRCS}
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_fax )
target_link_libraries(okularGenerator_fax ${KDE4_KDECORE_LIBS} oKularcore oKularconf ${KDE4_KDEUI_LIBS} kfaximage )
target_link_libraries(okularGenerator_fax ${KDE4_KDECORE_LIBS} oKularcore ${KDE4_KDEUI_LIBS} kfaximage )
install_targets(${LIB_INSTALL_DIR}/kde4 okularGenerator_fax )

12
generators/fax/faxrenderer.cpp
View file

@ -34,7 +34,7 @@ KPDF_EXPORT_PLUGIN(FaxRenderer)
FaxRenderer::FaxRenderer(KPDFDocument * doc)
: Generator( doc )
{
kdWarning() << "fax generator has landed" <<endl;
kWarning() << "fax generator has landed" <<endl;
}
void FaxRenderer::generatePixmap( PixmapRequest * request )
@ -43,7 +43,7 @@ void FaxRenderer::generatePixmap( PixmapRequest * request )
QString a="S";
if (request->async) a="As";
kdWarning() << a << "ync Pixmaprequestuest of " << request->width << "x"
kWarning() << a << "ync Pixmaprequestuest of " << request->width << "x"
<< request->height << " size, pageNo " << request->pageNumber
<< ", priority: " << request->priority << " pageaddress " << (unsigned long long int) request->page
<< endl;
@ -77,7 +77,7 @@ void FaxRenderer::generatePixmap( PixmapRequest * request )
page->returnPainter(foreGroundPaint);
}
} else
kdError() << "FaxRenderer::drawPage() called, but page size for page " << page->getPageNumber() << " is invalid." << endl;
kError() << "FaxRenderer::drawPage() called, but page size for page " << page->getPageNumber() << " is invalid." << endl;
// To indicate that the page was drawn, we set the appropriate flas in the page structure
page->isEmpty = false;
@ -92,7 +92,7 @@ void FaxRenderer::generatePixmap( PixmapRequest * request )
bool FaxRenderer::loadDocument( const QString & fileName, QVector< KPDFPage * > & pagesVector )
{
#ifdef KF_DEBUG
kdDebug() << "FaxRenderer::setFile(" << fname << ") called" << endl;
kDebug() << "FaxRenderer::setFile(" << fname << ") called" << endl;
#endif
// Wait for all access to this documentRenderer to finish
@ -101,7 +101,7 @@ bool FaxRenderer::loadDocument( const QString & fileName, QVector< KPDFPage * >
// Now we assume that the file is fine and load the file into the
// fax member. We abort on error and give an error message.
bool ok = fax.loadImage(fileName);
kdWarning(1000) << "fax " << fileName << " loaded ok: " << ok <<endl;
kWarning(1000) << "fax " << fileName << " loaded ok: " << ok <<endl;
// It can happen that fax.loadImage() returns with 'ok == true', but
// still the file could NOT be loaded. This happens, e.g. for TIFF
// file that do NOT contain FAX, but other image formats. We handle
@ -139,7 +139,7 @@ bool FaxRenderer::loadDocument( const QString & fileName, QVector< KPDFPage * >
double dpiy = dpi.y();
if (dpix*dpiy < 1.0) {
kdError() << "File invalid resolutions, dpi x = " << dpix << ", dpi y = " << dpiy << ". This information will be ignored and 75 DPI assumed." << endl;
kError() << "File invalid resolutions, dpi x = " << dpix << ", dpi y = " << dpiy << ". This information will be ignored and 75 DPI assumed." << endl;
dpix = dpiy = 75.0;
}
pagesVector[pg] = new KPDFPage(pg, QPaintDevice::x11AppDpiX () * pageSize.width() / dpix,

2
generators/fax/libkfaximage/CMakeLists.txt
View file

@ -1,6 +1,6 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############