Diffstat (limited to 'noncore/unsupported/qpdf/QOutputDev.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 135 |
1 files changed, 66 insertions, 69 deletions
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp index 02f269d..15a58b1 100644 --- a/noncore/unsupported/qpdf/QOutputDev.cpp +++ b/noncore/unsupported/qpdf/QOutputDev.cpp @@ -42,4 +42,7 @@ #include <qclipboard.h> +//#define QPDFDBG(x) x // special debug mode +#define QPDFDBG(x) // normal compilation + //------------------------------------------------------------------------ @@ -48,14 +51,7 @@ -static inline int q_rnd ( fp_t d ) -{ -// qDebug ( "Q_RND: %f -> %d\n", (double) d, (int) ( d >= 0 ? d +0.5 : d - 0.5 )); - - return (int) ( d >= 0 ? d + 0.5 : d - 0.5 ); -} - static inline QColor q_col ( const GfxRGB &rgb ) { - return QColor ( q_rnd ( rgb. r * 255 ), q_rnd ( rgb. g * 255 ), q_rnd ( rgb. b * 255 )); + return QColor ( lrint ( rgb. r * 255 ), lrint ( rgb. g * 255 ), lrint ( rgb. b * 255 )); } @@ -111,7 +107,7 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp // compute size and normalized transform matrix - int size = q_rnd ( sqrt ( m21 * m21 + m22 * m22 )); + int size = lrint ( sqrt ( m21 * m21 + m22 * m22 )); -/* qDebug ( "SET FONT: Name=%s, Size=%d, Bold=%d, Italic=%d, Mono=%d, Serif=%d, Symbol=%d, CID=%d, EmbFN=%s, M=(%f,%f,%f,%f)\n", + QPDFDBG( printf ( "SET FONT: Name=%s, Size=%d, Bold=%d, Italic=%d, Mono=%d, Serif=%d, Symbol=%d, CID=%d, EmbFN=%s, M=(%f,%f,%f,%f)\n", (( gfxFont-> getName ( )) ? gfxFont-> getName ( )-> getCString ( ) : "<n/a>" ), size, @@ -123,6 +119,6 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp gfxFont-> isCIDFont ( ), ( gfxFont-> getEmbeddedFontName ( ) ? gfxFont-> getEmbeddedFontName ( ) : "<n/a>" ), - (double) m11, (double) m12, (double) m21, (double) m22 ); -*/ + (double) m11, (double) m12, (double) m21, (double) m22 )); + QString fname (( gfxFont-> getName ( )) ? gfxFont-> getName ( )-> getCString ( ) : "<n/a>" ); @@ -186,4 +182,6 @@ QOutputDev::QOutputDev ( QWidget *parent, const char *name, int flags ) : QScrol m_painter = 0; + m_use_string = true; + // create text object m_text = new TextPage ( gFalse ); @@ -203,8 +201,8 @@ void QOutputDev::startPage ( int /*pageNum*/, GfxState *state ) delete m_painter; - m_pixmap = new QPixmap ( q_rnd ( state-> getPageWidth ( )), q_rnd ( state-> getPageHeight ( ))); + m_pixmap = new QPixmap ( lrint ( state-> getPageWidth ( )), lrint ( state-> getPageHeight ( ))); m_painter = new QPainter ( m_pixmap ); -// qDebug ( "NEW PIXMAP (%d x %d)\n", q_rnd ( state-> getPageWidth ( )), q_rnd ( state-> getPageHeight ( ))); + QPDFDBG( printf ( "NEW PIXMAP (%ld x %ld)\n", lrint ( state-> getPageWidth ( )), lrint ( state-> getPageHeight ( )))); resizeContents ( m_pixmap-> width ( ), m_pixmap-> height ( )); @@ -247,5 +245,5 @@ void QOutputDev::drawLink ( Link *link, Catalog */*catalog*/ ) void QOutputDev::saveState ( GfxState */*state*/ ) { -// qDebug ( "SAVE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( )); + QPDFDBG( printf ( "SAVE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( ))); m_painter-> save ( ); @@ -258,5 +256,5 @@ void QOutputDev::restoreState ( GfxState */*state*/ ) // m_painter-> setClipRegion ( QRect ( 0, 0, m_pixmap-> width ( ), m_pixmap-> height ( ))); // m_painter-> setClipping ( false ); -// qDebug ( "RESTORE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( )); + QPDFDBG ( printf ( "RESTORE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( ))); } @@ -284,5 +282,5 @@ void QOutputDev::updateFlatness ( GfxState */*state*/ ) { // not supported -// qDebug ( "updateFlatness not supported !\n" ); + QPDFDBG( printf ( "updateFlatness not supported !\n" )); } @@ -300,5 +298,5 @@ void QOutputDev::updateLineCap ( GfxState *state ) void QOutputDev::updateMiterLimit ( GfxState */*state*/ ) { -// qDebug ( "updateMiterLimit not supported !\n" ); + QPDFDBG( printf ( "updateMiterLimit not supported !\n" )); } @@ -318,5 +316,5 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash ) int width; - width = q_rnd ( state-> getTransformedLineWidth ( )); + width = lrint ( state-> getTransformedLineWidth ( )); switch ( state-> getLineCap ( )) { @@ -410,5 +408,5 @@ void QOutputDev::stroke ( GfxState *state ) int n = convertPath ( state, points, lengths ); -// qDebug ( "DRAWING: %d POLYS\n", n ); + QPDFDBG( printf ( "DRAWING: %d POLYS\n", n )); // draw each subpath @@ -418,8 +416,8 @@ void QOutputDev::stroke ( GfxState *state ) if ( len >= 2 ) { -// qDebug ( " - POLY %d: ", i ); -// for ( int ii = 0; ii < len; ii++ ) -// qDebug ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )); -// qDebug ( "\n" ); + QPDFDBG( printf ( " - POLY %d: ", i )); + QPDFDBG( for ( int ii = 0; ii < len; ii++ )) + QPDFDBG( printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( ))); + QPDFDBG( printf ( "\n" )); m_painter-> drawPolyline ( points, j, len ); @@ -457,5 +455,5 @@ void QOutputDev::doFill ( GfxState *state, bool winding ) int n = convertPath ( state, points, lengths ); -// qDebug ( "FILLING: %d POLYS\n", n ); + QPDFDBG( printf ( "FILLING: %d POLYS\n", n )); QPen oldpen = m_painter-> pen ( ); @@ -468,8 +466,8 @@ void QOutputDev::doFill ( GfxState *state, bool winding ) if ( len >= 3 ) { -// qDebug ( " - POLY %d: ", i ); -// for ( int ii = 0; ii < len; ii++ ) -// qDebug ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )); -// qDebug ( "\n" ); + QPDFDBG( printf ( " - POLY %d: ", i )); + QPDFDBG( for ( int ii = 0; ii < len; ii++ )) + QPDFDBG( printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( ))); + QPDFDBG( printf ( "\n" )); m_painter-> drawPolygon ( points, winding, j, len ); @@ -502,5 +500,5 @@ void QOutputDev::doClip ( GfxState *state, bool winding ) QRegion region; -// qDebug ( "CLIPPING: %d POLYS\n", n ); + QPDFDBG( printf ( "CLIPPING: %d POLYS\n", n )); // draw each subpath @@ -513,8 +511,7 @@ void QOutputDev::doClip ( GfxState *state, bool winding ) dummy. setRawData ( points. data ( ) + j, len ); -// qDebug ( " - POLY %d: ", i ); -// for ( int ii = 0; ii < len; ii++ ) -// qDebug ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )); -// qDebug ( "\n" ); + QPDFDBG( printf ( " - POLY %d: ", i )); + QPDFDBG( for ( int ii = 0; ii < len; ii++ ) printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( ))); + QPDFDBG( printf ( "\n" )); region |= QRegion ( dummy, winding ); @@ -582,6 +579,6 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr QPointArray tmp; - tmp. setPoints ( 4, q_rnd ( x0 ), q_rnd ( y0 ), q_rnd ( x1 ), q_rnd ( y1 ), - q_rnd ( x2 ), q_rnd ( y2 ), q_rnd ( x3 ), q_rnd ( y3 )); + tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ), + lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 )); #if QT_VERSION < 300 @@ -602,5 +599,5 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr state-> transform ( subpath-> getX ( i ), subpath-> getY ( i ), &x1, &y1 ); - points. putPoints ( points. count ( ), 1, q_rnd ( x1 ), q_rnd ( y1 )); + points. putPoints ( points. count ( ), 1, lrint ( x1 ), lrint ( y1 )); ++i; } @@ -625,7 +622,7 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, { fp_t x1, y1, dx1, dy1; - - m_text-> addChar ( state, x, y, dx, dy, u, uLen ); - + + if ( uLen > 0 ) + m_text-> addChar ( state, x, y, dx, dy, u, uLen ); // check for invisible text -- this is used by Acrobat Capture @@ -652,5 +649,5 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, else { str [i] = ' '; -// qDebug ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( )); + QPDFDBG( printf ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( ))); } } @@ -678,5 +675,5 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, cerr << endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl; - QWMatrix mat ( q_rnd ( m11 / fsize ), q_rnd ( m12 / fsize ), -q_rnd ( m21 / fsize ), -q_rnd ( m22 / fsize ), q_rnd ( x1 ), q_rnd ( y1 )); + QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 )); m_painter-> setWorldMatrix ( mat ); @@ -697,7 +694,7 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, if ( fsize > 5 ) - m_painter-> drawText ( q_rnd ( x1 ), q_rnd ( y1 ), str ); + m_painter-> drawText ( lrint ( x1 ), lrint ( y1 ), str ); else - m_painter-> fillRect ( q_rnd ( x1 ), q_rnd ( y1 ), q_rnd ( QMAX( fp_t(1), dx1 )), q_rnd ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( )); + m_painter-> fillRect ( lrint ( x1 ), lrint ( y1 ), lrint ( QMAX( fp_t(1), dx1 )), lrint ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( )); m_painter-> setPen ( oldpen ); @@ -708,5 +705,5 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, #endif -// qDebug ( "DRAW TEXT: \"%s\" at (%d/%d)\n", str. local8Bit ( ). data ( ), q_rnd ( x1 ), q_rnd ( y1 )); + QPDFDBG( printf ( "DRAW TEXT: \"%s\" at (%ld/%ld)\n", str. local8Bit ( ). data ( ), lrint ( x1 ), lrint ( y1 ))); } else if ( code != 0 ) { @@ -740,5 +737,5 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, GfxRGB rgb; state-> getFillRGB ( &rgb ); - uint val = ( q_rnd ( rgb. r * 255 ) & 0xff ) << 16 | ( q_rnd ( rgb. g * 255 ) & 0xff ) << 8 | ( q_rnd ( rgb. b * 255 ) & 0xff ); + uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff ); @@ -746,5 +743,5 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, img. setAlphaBuffer ( true ); -// qDebug ( "IMAGE MASK (%dx%d)\n", width, height ); + QPDFDBG( printf ( "IMAGE MASK (%dx%d)\n", width, height )); // initialize the image stream @@ -801,12 +798,12 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, #else if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { - qDebug ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" ); + QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); } else { - int x = q_rnd ( ctm [4] ); - int y = q_rnd ( ctm [5] ); + int x = lrint ( ctm [4] ); + int y = lrint ( ctm [5] ); - int w = q_rnd ( ctm [0] ); - int h = q_rnd ( ctm [3] ); + int w = lrint ( ctm [0] ); + int h = lrint ( ctm [3] ); if ( w < 0 ) { @@ -819,5 +816,5 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, } -// qDebug ( "DRAWING IMAGE MASKED: %d/%d - %dx%d\n", x, y, w, h ); + QPDFDBG( printf ( "DRAWING IMAGE MASKED: %d/%d - %dx%d\n", x, y, w, h )); img = img. smoothScale ( w, h ); @@ -864,5 +861,5 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi img. setAlphaBuffer ( true ); -// qDebug ( "IMAGE (%dx%d)\n", width, height ); + QPDFDBG( printf ( "IMAGE (%dx%d)\n", width, height )); // initialize the image stream @@ -889,5 +886,5 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi colorMap-> getRGB ( pixBuf, &rgb ); - uint val = ( q_rnd ( rgb. r * 255 ) & 0xff ) << 16 | ( q_rnd ( rgb. g * 255 ) & 0xff ) << 8 | ( q_rnd ( rgb. b * 255 ) & 0xff ); + uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff ); if ( maskColors ) { @@ -931,12 +928,12 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { - qDebug ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" ); + QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); } else { - int x = q_rnd ( ctm [4] ); - int y = q_rnd ( ctm [5] ); + int x = lrint ( ctm [4] ); + int y = lrint ( ctm [5] ); - int w = q_rnd ( ctm [0] ); - int h = q_rnd ( ctm [3] ); + int w = lrint ( ctm [0] ); + int h = lrint ( ctm [3] ); if ( w < 0 ) { @@ -949,5 +946,5 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi } -// qDebug ( "DRAWING IMAGE: %d/%d - %dx%d\n", x, y, w, h ); + QPDFDBG( printf ( "DRAWING IMAGE: %d/%d - %dx%d\n", x, y, w, h )); img = img. smoothScale ( w, h ); @@ -991,8 +988,8 @@ bool QOutputDev::findText ( const QString &str, int &l, int &t, int &w, int &h, if ( m_text-> findText ( s, len, top, bottom, &x1, &y1, &x2, &y2 )) { - l = q_rnd ( x1 ); - t = q_rnd ( y1 ); - w = q_rnd ( x2 ) - l + 1; - h = q_rnd ( y2 ) - t + 1; + l = lrint ( x1 ); + t = lrint ( y1 ); + w = lrint ( x2 ) - l + 1; + h = lrint ( y2 ) - t + 1; found = true; } @@ -1011,8 +1008,8 @@ GBool QOutputDev::findText ( Unicode *s, int len, GBool top, GBool bottom, int * if ( m_text-> findText ( s, len, top, bottom, &xMin1, &yMin1, &xMax1, &yMax1 )) { - *xMin = q_rnd ( xMin1 ); - *xMax = q_rnd ( xMax1 ); - *yMin = q_rnd ( yMin1 ); - *yMax = q_rnd ( yMax1 ); + *xMin = lrint ( xMin1 ); + *xMax = lrint ( xMax1 ); + *yMin = lrint ( yMin1 ); + *yMax = lrint ( yMax1 ); found = true; } |