summaryrefslogtreecommitdiff
authorsandman <sandman>2002-04-16 22:16:56 (UTC)
committer sandman <sandman>2002-04-16 22:16:56 (UTC)
commitece373988ee95e4dc3c22eeb012a077595740057 (patch) (side-by-side diff)
treef28fc0976feae59e9b31eae7c17611943cb8a0f2
parente7e4ecaae60f5444c4ec581077f91e6b412c780c (diff)
downloadopie-ece373988ee95e4dc3c22eeb012a077595740057.zip
opie-ece373988ee95e4dc3c22eeb012a077595740057.tar.gz
opie-ece373988ee95e4dc3c22eeb012a077595740057.tar.bz2
- fixed a bug with zero-length strings
- introduces macros for fast PDF-debugging - speedup in math-emulation (rounding,sqrt,fabs) - libstdc++ not needed anymore
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/qpdf/QOutputDev.cpp135
-rw-r--r--noncore/unsupported/qpdf/fixed.h28
-rw-r--r--noncore/unsupported/qpdf/qpdf.pro2
3 files changed, 91 insertions, 74 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
@@ -32,40 +32,36 @@
#include "TextOutputDev.h"
#include "QOutputDev.h"
#include <qpixmap.h>
#include <qimage.h>
#include <qpainter.h>
#include <qdict.h>
#include <qtimer.h>
#include <qapplication.h>
#include <qclipboard.h>
+//#define QPDFDBG(x) x // special debug mode
+#define QPDFDBG(x) // normal compilation
+
//------------------------------------------------------------------------
// Constants and macros
//------------------------------------------------------------------------
-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 ));
}
//------------------------------------------------------------------------
// Font substitutions
//------------------------------------------------------------------------
struct QOutFontSubst {
char * m_name;
char * m_sname;
bool m_bold;
bool m_italic;
@@ -101,38 +97,38 @@ static QOutFontSubst qStdFonts [] = {
QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp_t m22 )
{
static QDict<QOutFontSubst> stdfonts;
// build dict for std. fonts on first invocation
if ( stdfonts. isEmpty ( )) {
for ( QOutFontSubst *ptr = qStdFonts; ptr-> m_name; ptr++ ) {
stdfonts. insert ( QString ( ptr-> m_name ), ptr );
}
}
// 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,
gfxFont-> isBold ( ),
gfxFont-> isItalic ( ),
gfxFont-> isFixedWidth ( ),
gfxFont-> isSerif ( ),
gfxFont-> isSymbolic ( ),
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>" );
QFont f;
f. setPixelSize ( size > 0 ? size : 8 ); // type3 fonts misbehave sometimes
// fast lookup for std. fonts
QOutFontSubst *subst = stdfonts [fname];
if ( subst ) {
if ( subst-> m_sname )
f. setFamily ( subst-> m_sname );
@@ -176,45 +172,47 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp
//------------------------------------------------------------------------
// QOutputDev
//------------------------------------------------------------------------
QOutputDev::QOutputDev ( QWidget *parent, const char *name, int flags ) : QScrollView ( parent, name, WRepaintNoErase | WResizeNoErase | flags )
{
m_pixmap = 0;
m_painter = 0;
+ m_use_string = true;
+
// create text object
m_text = new TextPage ( gFalse );
}
QOutputDev::~QOutputDev ( )
{
delete m_painter;
delete m_pixmap;
delete m_text;
}
void QOutputDev::startPage ( int /*pageNum*/, GfxState *state )
{
delete m_pixmap;
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 ( ));
setContentsPos ( 0, 0 );
m_pixmap-> fill ( white ); // clear window
m_text-> clear ( ); // cleat text object
viewport ( )-> repaint ( );
}
void QOutputDev::endPage ( )
{
m_text-> coalesce ( );
@@ -237,36 +235,36 @@ void QOutputDev::drawLink ( Link *link, Catalog */*catalog*/ )
cvtUserToDev ( x1, y1, &x, &y );
cvtUserToDev ( x2, y2, &dx, &dy );
QPen oldpen = m_painter-> pen ( );
m_painter-> setPen ( blue );
m_painter-> drawRect ( x, y, dx, dy );
m_painter-> setPen ( oldpen );
}
}
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 ( );
}
void QOutputDev::restoreState ( GfxState */*state*/ )
{
m_painter-> restore ( );
// 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 ( )));
}
void QOutputDev::updateAll ( GfxState *state )
{
updateLineAttrs ( state, gTrue );
// updateFlatness ( state );
// updateMiterLimit ( state );
updateFillColor ( state );
updateStrokeColor ( state );
updateFont ( state );
}
@@ -274,59 +272,59 @@ void QOutputDev::updateCTM ( GfxState *state, fp_t /*m11*/, fp_t /*m12*/, fp_t /
{
updateLineAttrs ( state, gTrue );
}
void QOutputDev::updateLineDash ( GfxState *state )
{
updateLineAttrs ( state, gTrue );
}
void QOutputDev::updateFlatness ( GfxState */*state*/ )
{
// not supported
-// qDebug ( "updateFlatness not supported !\n" );
+ QPDFDBG( printf ( "updateFlatness not supported !\n" ));
}
void QOutputDev::updateLineJoin ( GfxState *state )
{
updateLineAttrs ( state, gFalse );
}
void QOutputDev::updateLineCap ( GfxState *state )
{
updateLineAttrs ( state, gFalse );
}
// unimplemented
void QOutputDev::updateMiterLimit ( GfxState */*state*/ )
{
-// qDebug ( "updateMiterLimit not supported !\n" );
+ QPDFDBG( printf ( "updateMiterLimit not supported !\n" ));
}
void QOutputDev::updateLineWidth ( GfxState *state )
{
updateLineAttrs ( state, gFalse );
}
void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
{
fp_t *dashPattern;
int dashLength;
fp_t dashStart;
Qt::PenCapStyle cap;
Qt::PenJoinStyle join;
int width;
- width = q_rnd ( state-> getTransformedLineWidth ( ));
+ width = lrint ( state-> getTransformedLineWidth ( ));
switch ( state-> getLineCap ( )) {
case 0: cap = FlatCap; break;
case 1: cap = RoundCap; break;
case 2: cap = SquareCap; break;
default:
qWarning ( "Bad line cap style (%d)\n", state-> getLineCap ( ));
cap = FlatCap;
break;
}
switch (state->getLineJoin()) {
@@ -400,36 +398,36 @@ void QOutputDev::updateFont ( GfxState *state )
m_painter-> setFont ( font );
m_text-> updateFont ( state );
}
void QOutputDev::stroke ( GfxState *state )
{
QPointArray points;
QArray<int> lengths;
// transform points
int n = convertPath ( state, points, lengths );
-// qDebug ( "DRAWING: %d POLYS\n", n );
+ QPDFDBG( printf ( "DRAWING: %d POLYS\n", n ));
// draw each subpath
int j = 0;
for ( int i = 0; i < n; i++ ) {
int len = lengths [i];
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 );
}
j += len;
}
qApp-> processEvents ( );
}
void QOutputDev::fill ( GfxState *state )
{
doFill ( state, true );
}
@@ -447,39 +445,39 @@ void QOutputDev::eoFill ( GfxState *state )
// polygon, it also draws lines around the border. This is done
// only for single-component polygons, since it's not very
// compatible with the compound polygon kludge (see convertPath()).
//
void QOutputDev::doFill ( GfxState *state, bool winding )
{
QPointArray points;
QArray<int> lengths;
// transform points
int n = convertPath ( state, points, lengths );
-// qDebug ( "FILLING: %d POLYS\n", n );
+ QPDFDBG( printf ( "FILLING: %d POLYS\n", n ));
QPen oldpen = m_painter-> pen ( );
m_painter-> setPen ( QPen ( NoPen ));
// draw each subpath
int j = 0;
for ( int i = 0; i < n; i++ ) {
int len = lengths [i];
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 );
}
j += len;
}
m_painter-> setPen ( oldpen );
qApp-> processEvents ( );
}
void QOutputDev::clip ( GfxState *state )
{
@@ -492,39 +490,38 @@ void QOutputDev::eoClip ( GfxState *state )
}
void QOutputDev::doClip ( GfxState *state, bool winding )
{
QPointArray points;
QArray<int> lengths;
// transform points
int n = convertPath ( state, points, lengths );
QRegion region;
-// qDebug ( "CLIPPING: %d POLYS\n", n );
+ QPDFDBG( printf ( "CLIPPING: %d POLYS\n", n ));
// draw each subpath
int j = 0;
for ( int i = 0; i < n; i++ ) {
int len = lengths [i];
if ( len >= 3 ) {
QPointArray dummy;
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 );
dummy. resetRawData ( points. data ( ) + j, len );
}
j += len;
}
if ( m_painter-> hasClipping ( ))
region &= m_painter-> clipRegion ( );
// m_painter-> setClipRegion ( region );
@@ -572,95 +569,95 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
int m = subpath-> getNumPoints ( );
int i = 0;
while ( i < m ) {
if ( i >= 1 && subpath-> getCurve ( i )) {
state-> transform ( subpath-> getX ( i - 1 ), subpath-> getY ( i - 1 ), &x0, &y0 );
state-> transform ( subpath-> getX ( i ), subpath-> getY ( i ), &x1, &y1 );
state-> transform ( subpath-> getX ( i + 1 ), subpath-> getY ( i + 1 ), &x2, &y2 );
state-> transform ( subpath-> getX ( i + 2 ), subpath-> getY ( i + 2 ), &x3, &y3 );
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
tmp = tmp. quadBezier ( );
for ( uint loop = 0; loop < tmp. count ( ); loop++ ) {
QPoint p = tmp. point ( loop );
points. putPoints ( points. count ( ), 1, p. x ( ), p. y ( ));
}
#else
tmp = tmp. cubicBezier ( );
points. putPoints ( points. count ( ), tmp. count ( ), tmp );
#endif
i += 3;
}
else {
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;
}
}
return points. count ( ) - oldcnt;
}
void QOutputDev::beginString ( GfxState *state, GString */*s*/ )
{
m_text-> beginString ( state );
}
void QOutputDev::endString ( GfxState */*state*/ )
{
m_text-> endString ( );
}
void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
fp_t dx, fp_t dy, fp_t originX, fp_t originY,
CharCode code, Unicode *u, int uLen )
{
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
if (( state-> getRender ( ) & 3 ) == 3 ) {
return;
}
x -= originX;
y -= originY;
state-> transform ( x, y, &x1, &y1 );
state-> transformDelta ( dx, dy, &dx1, &dy1 );
if ( uLen > 0 ) {
QString str;
QFontMetrics fm = m_painter-> fontMetrics ( );
for ( int i = 0; i < uLen; i++ ) {
QChar c = QChar ( u [i] );
if ( fm. inFont ( c )) {
str [i] = QChar ( u [i] );
}
else {
str [i] = ' ';
-// qDebug ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( ));
+ QPDFDBG( printf ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( )));
}
}
if (( uLen == 1 ) && ( str [0] == ' ' ))
return;
fp_t m11, m12, m21, m22;
state-> getFontTransMat ( &m11, &m12, &m21, &m22 );
m11 *= state-> getHorizScaling ( );
m12 *= state-> getHorizScaling ( );
@@ -668,55 +665,55 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
fp_t fsize = m_painter-> font ( ). pixelSize ( );
#ifndef QT_NO_TRANSFORMATIONS
QWMatrix oldmat;
bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 ));
if ( dorot ) {
oldmat = m_painter-> worldMatrix ( );
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 );
x1 = 0;
y1 = 0;
}
#endif
QPen oldpen = m_painter-> pen ( );
if (!( state-> getRender ( ) & 1 )) {
QPen fillpen = oldpen;
fillpen. setColor ( m_painter-> brush ( ). color ( ));
m_painter-> setPen ( fillpen );
}
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 );
#ifndef QT_NO_TRANSFORMATIONS
if ( dorot )
m_painter-> setWorldMatrix ( oldmat );
#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 ) {
// some PDF files use CID 0, which is .notdef, so just ignore it
qWarning ( "Unknown character (CID=%d Unicode=%hx)\n", code, (unsigned short) ( uLen > 0 ? u [0] : (Unicode) 0 ));
}
qApp-> processEvents ( );
}
void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, int width, int height, GBool invert, GBool inlineImg )
{
@@ -730,31 +727,31 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
str-> reset ( );
int j = height * (( width + 7 ) / 8 );
for ( int i = 0; i < j; i++ )
str->getChar();
str->close();
}
return;
}
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 );
QImage img ( width, height, 32 );
img. setAlphaBuffer ( true );
-// qDebug ( "IMAGE MASK (%dx%d)\n", width, height );
+ QPDFDBG( printf ( "IMAGE MASK (%dx%d)\n", width, height ));
// initialize the image stream
ImageStream *imgStr = new ImageStream ( str, width, 1, 1 );
imgStr-> reset ( );
uchar **scanlines = img. jumpTable ( );
if ( ctm [3] > 0 )
scanlines += ( height - 1 );
for ( int y = 0; y < height; y++ ) {
QRgb *scanline = (QRgb *) *scanlines;
@@ -791,43 +788,43 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
#ifdef QWS
QPixmap pm;
pm. convertFromImage ( img );
m_painter-> drawPixmap ( 0, 0, pm );
#else
m_painter-> drawImage ( QPoint ( 0, 0 ), img );
#endif
m_painter-> setWorldMatrix ( oldmat );
#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 ) {
x += w;
w = -w;
}
if ( h < 0 ) {
y += h;
h = -h;
}
-// 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 );
qApp-> processEvents ( );
m_painter-> drawImage ( x, y, img );
}
#endif
delete imgStr;
qApp-> processEvents ( );
}
@@ -854,50 +851,50 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
str->getChar();
str->close();
}
return;
}
QImage img ( width, height, 32 );
if ( maskColors )
img. setAlphaBuffer ( true );
-// qDebug ( "IMAGE (%dx%d)\n", width, height );
+ QPDFDBG( printf ( "IMAGE (%dx%d)\n", width, height ));
// initialize the image stream
ImageStream *imgStr = new ImageStream ( str, width, nComps, nBits );
imgStr-> reset ( );
Guchar pixBuf [gfxColorMaxComps];
GfxRGB rgb;
uchar **scanlines = img. jumpTable ( );
if ( ctm [3] > 0 )
scanlines += ( height - 1 );
for ( int y = 0; y < height; y++ ) {
QRgb *scanline = (QRgb *) *scanlines;
if ( ctm [0] < 0 )
scanline += ( width - 1 );
for ( int x = 0; x < width; x++ ) {
imgStr-> getPixel ( pixBuf );
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 ) {
for ( int k = 0; k < nComps; ++k ) {
if (( pixBuf [k] < maskColors [2 * k] ) || ( pixBuf [k] > maskColors [2 * k] )) {
val |= 0xff000000;
break;
}
}
}
*scanline = val;
ctm [0] < 0 ? scanline-- : scanline++;
@@ -921,43 +918,43 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
QPixmap pm;
pm. convertFromImage ( img );
m_painter-> drawPixmap ( 0, 0, pm );
#else
m_painter-> drawImage ( QPoint ( 0, 0 ), img );
#endif
m_painter-> setWorldMatrix ( oldmat );
#else // QT_NO_TRANSFORMATIONS
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 ) {
x += w;
w = -w;
}
if ( h < 0 ) {
y += h;
h = -h;
}
-// 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 );
qApp-> processEvents ( );
m_painter-> drawImage ( x, y, img );
}
#endif
delete imgStr;
qApp-> processEvents ( );
}
@@ -981,48 +978,48 @@ bool QOutputDev::findText ( const QString &str, int &l, int &t, int &w, int &h,
uint len = str. length ( );
Unicode *s = new Unicode [len];
for ( uint i = 0; i < len; i++ )
s [i] = str [i]. unicode ( );
fp_t x1 = (fp_t) l;
fp_t y1 = (fp_t) t;
fp_t x2 = (fp_t) l + w - 1;
fp_t y2 = (fp_t) t + h - 1;
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;
}
delete [] s;
return found;
}
GBool QOutputDev::findText ( Unicode *s, int len, GBool top, GBool bottom, int *xMin, int *yMin, int *xMax, int *yMax )
{
bool found = false;
fp_t xMin1 = (double) *xMin;
fp_t yMin1 = (double) *yMin;
fp_t xMax1 = (double) *xMax;
fp_t yMax1 = (double) *yMax;
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;
}
return found;
}
QString QOutputDev::getText ( int l, int t, int w, int h )
{
GString *gstr = m_text-> getText ( l, t, l + w - 1, t + h - 1 );
QString str = gstr-> getCString ( );
delete gstr;
return str;
}
diff --git a/noncore/unsupported/qpdf/fixed.h b/noncore/unsupported/qpdf/fixed.h
index 111b95e..c912954 100644
--- a/noncore/unsupported/qpdf/fixed.h
+++ b/noncore/unsupported/qpdf/fixed.h
@@ -111,24 +111,28 @@ private:
friend bool operator > <> ( double d, const fixed &f );
friend bool operator <= <> ( double d, const fixed &f );
friend bool operator >= <> ( double d, const fixed &f );
friend bool operator == <> ( double d, const fixed &f );
friend bool operator != <> ( double d, const fixed &f );
friend bool operator < <> ( int i, const fixed &f );
friend bool operator > <> ( int i, const fixed &f );
friend bool operator <= <> ( int i, const fixed &f );
friend bool operator >= <> ( int i, const fixed &f );
friend bool operator == <> ( int i, const fixed &f );
friend bool operator != <> ( int i, const fixed &f );
+
+ friend long int lrint ( const fixed &f );
+ friend fixed sqrt ( const fixed &f );
+ friend fixed fabs ( const fixed &f );
#endif
};
template <unsigned int SH> inline fixed<SH> operator + ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) + f. m_f, true ); }
template <unsigned int SH> inline fixed<SH> operator - ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) - f. m_f, true ); }
template <unsigned int SH> inline fixed<SH> operator * ( int i, const fixed<SH> &f ) { return fixed<SH> ( i * f. m_f, true ); }
template <unsigned int SH> inline fixed<SH> operator / ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::div ( fixed<SH>::i2f( i ), f. m_f ), true ); }
//template <unsigned int SH> inline fixed<SH> operator / ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f ( i / fixed<SH>::f2i ( f. m_f )), true ); }
template <unsigned int SH> inline fixed<SH> operator + ( double d, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::d2f( d ) + f. m_f, true ); }
template <unsigned int SH> inline fixed<SH> operator - ( double d, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::d2f( d ) - f. m_f, true ); }
@@ -140,30 +144,46 @@ template <unsigned int SH> inline bool operator > ( double d, const fixed<SH> &
template <unsigned int SH> inline bool operator <= ( double d, const fixed<SH> &f ) { return fixed<SH>::d2f( d ) <= f. m_f; }
template <unsigned int SH> inline bool operator >= ( double d, const fixed<SH> &f ) { return fixed<SH>::d2f( d ) >= f. m_f; }
template <unsigned int SH> inline bool operator == ( double d, const fixed<SH> &f ) { return fixed<SH>::d2f( d ) == f. m_f; }
template <unsigned int SH> inline bool operator != ( double d, const fixed<SH> &f ) { return fixed<SH>::d2f( d ) != f. m_f; }
template <unsigned int SH> inline bool operator < ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) < f. m_f; }
template <unsigned int SH> inline bool operator > ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) > f. m_f; }
template <unsigned int SH> inline bool operator <= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) <= f. m_f; }
template <unsigned int SH> inline bool operator >= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) >= f. m_f; }
template <unsigned int SH> inline bool operator == ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) == f. m_f; }
template <unsigned int SH> inline bool operator != ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) != f. m_f; }
-
-template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f )
+template <unsigned int SH> inline long int lrint ( const fixed<SH> &f )
{
- return fixed<SH> ( double( sqrt ( double( f ))));
+ return fixed<SH>::f2i (( f. m_f < 0 ) ? f. m_f - ( 1 << ( SH - 1 )) : f. m_f + ( 1 << ( SH - 1 )));
}
template <unsigned int SH> inline fixed<SH> fabs ( const fixed<SH> &f )
{
- return ( f < 0 ) ? -f : f;
+ return ( f. m_f < 0 ) ? fixed<SH> ( -f. m_f, true ) : f;
+}
+
+// roughly from QPE / qmath.h
+template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f )
+{
+ if ( f. m_f <= 0 )
+ return fixed<SH> ( 0, true );
+
+ fixed<SH>::fix_t a0 = 0;
+ fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation
+
+ do {
+ a0 = a1;
+ a1 = ( a0 + fixed<SH>::div ( f. m_f, a0 )) >> 1;
+ } while ( abs ( fixed<SH>::div ( a1 - a0, a1 )) > 1 );
+
+ return fixed<SH> ( a1, true );
}
template <unsigned int SH> inline ostream &operator << ( ostream &o, const fixed<SH> &f )
{
o << double( f );
return o;
}
#endif
diff --git a/noncore/unsupported/qpdf/qpdf.pro b/noncore/unsupported/qpdf/qpdf.pro
index 6ba4f49..0c2e38b 100644
--- a/noncore/unsupported/qpdf/qpdf.pro
+++ b/noncore/unsupported/qpdf/qpdf.pro
@@ -43,18 +43,18 @@ SOURCES = xpdf/Array.cc \
HEADERS = QOutputDev.h \
QPEOutputDev.h \
qbusybar.h \
qpdf.h
INCLUDEPATH += . \
.. \
xpdf \
$(OPIEDIR)/include \
../goo \
goo
-LIBS += -L $(OPIEDIR)/lib -lqpe -lstdc++
+LIBS += -L $(OPIEDIR)/lib -lqpe
DESTDIR = $(OPIEDIR)/bin
TARGET = qpdf
TRANSLATIONS = ../../i18n/de/qpdf.ts