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

List:       kde-commits
Subject:    KDE/kdegraphics/okular/generators/tiff
From:       Pino Toscano <pino () kde ! org>
Date:       2008-11-30 19:21:24
Message-ID: 1228072884.778418.23096.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890978 by pino:

isolate the tiff loading in an own function


 M  +7 -16     generator_tiff.cpp  
 M  +1 -0      generator_tiff.h  


--- trunk/KDE/kdegraphics/okular/generators/tiff/generator_tiff.cpp #890977:890978
@@ -204,21 +204,7 @@
     qfile->open( QIODevice::ReadOnly );
     d->dev = qfile;
     d->data = QFile::encodeName( QFileInfo( *qfile ).fileName() );
-    d->tiff = TIFFClientOpen( d->data.constData(), "r", d->dev,
-                  okular_tiffReadProc, okular_tiffWriteProc, okular_tiffSeekProc,
-                  okular_tiffCloseProc, okular_tiffSizeProc,
-                  okular_tiffMapProc, okular_tiffUnmapProc );
-    if ( !d->tiff )
-    {
-        delete d->dev;
-        d->dev = 0;
-        d->data.clear();
-        return false;
-    }
-
-    loadPages( pagesVector );
-
-    return true;
+    return loadTiff( pagesVector, d->data.constData() );
 }
 
 bool TIFFGenerator::loadDocumentFromData( const QByteArray & fileData, QVector< \
Okular::Page * > & pagesVector ) @@ -227,7 +213,12 @@
     QBuffer* qbuffer = new QBuffer( &d->data );
     qbuffer->open( QIODevice::ReadOnly );
     d->dev = qbuffer;
-    d->tiff = TIFFClientOpen( "<stdin>", "r", d->dev,
+    return loadTiff( pagesVector, "<stdin>" );
+}
+
+bool TIFFGenerator::loadTiff( QVector< Okular::Page * > & pagesVector, const char \
*name ) +{
+    d->tiff = TIFFClientOpen( name, "r", d->dev,
                   okular_tiffReadProc, okular_tiffWriteProc, okular_tiffSeekProc,
                   okular_tiffCloseProc, okular_tiffSizeProc,
                   okular_tiffMapProc, okular_tiffUnmapProc );
--- trunk/KDE/kdegraphics/okular/generators/tiff/generator_tiff.h #890977:890978
@@ -36,6 +36,7 @@
         class Private;
         Private * const d;
 
+        bool loadTiff( QVector< Okular::Page * > & pagesVector, const char *name );
         void loadPages( QVector<Okular::Page*> & pagesVector );
         int mapPage( int page ) const;
 


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