summaryrefslogtreecommitdiff
path: root/noncore/unsupported
authorkergoth <kergoth>2002-11-14 22:40:52 (UTC)
committer kergoth <kergoth>2002-11-14 22:40:52 (UTC)
commitec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (unidiff)
treea65e8adc4edd60d7822f75e8b574e8e97596773c /noncore/unsupported
parent3f1d60609657ea69bda453f5c820a23ee5375ab8 (diff)
downloadopie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.zip
opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.gz
opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.bz2
namespace and include fix for uses of iostream in STL
Diffstat (limited to 'noncore/unsupported') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/qpdf/QOutputDev.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp
index f587a33..52237f5 100644
--- a/noncore/unsupported/qpdf/QOutputDev.cpp
+++ b/noncore/unsupported/qpdf/QOutputDev.cpp
@@ -16,12 +16,14 @@
16#include <stdlib.h> 16#include <stdlib.h>
17#include <stddef.h> 17#include <stddef.h>
18#include <unistd.h> 18#include <unistd.h>
19#include <string.h> 19#include <string.h>
20#include <ctype.h> 20#include <ctype.h>
21#include <math.h> 21#include <math.h>
22#include <iostream>
23
22#include "GString.h" 24#include "GString.h"
23#include "Object.h" 25#include "Object.h"
24#include "Stream.h" 26#include "Stream.h"
25#include "Link.h" 27#include "Link.h"
26#include "GfxState.h" 28#include "GfxState.h"
27#include "GfxFont.h" 29#include "GfxFont.h"
@@ -667,13 +669,13 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
667 669
668 bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 )); 670 bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 ));
669 671
670 if ( dorot ) { 672 if ( dorot ) {
671 oldmat = m_painter-> worldMatrix ( ); 673 oldmat = m_painter-> worldMatrix ( );
672 674
673 cerr << endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl; 675 std::cerr << std::endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
674 676
675 QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 )); 677 QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 ));
676 678
677 m_painter-> setWorldMatrix ( mat ); 679 m_painter-> setWorldMatrix ( mat );
678 680
679 x1 = 0; 681 x1 = 0;
@@ -774,14 +776,14 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
774 qApp-> processEvents ( ); 776 qApp-> processEvents ( );
775 } 777 }
776 778
777 #ifndef QT_NO_TRANSFORMATIONS 779 #ifndef QT_NO_TRANSFORMATIONS
778 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] ); 780 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
779 781
780 cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 782 std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
781 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl; 783 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
782 784
783 QWMatrix oldmat = m_painter-> worldMatrix ( ); 785 QWMatrix oldmat = m_painter-> worldMatrix ( );
784 m_painter-> setWorldMatrix ( mat, true ); 786 m_painter-> setWorldMatrix ( mat, true );
785 787
786#ifdef QWS 788#ifdef QWS
787 QPixmap pm; 789 QPixmap pm;
@@ -903,14 +905,14 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
903 } 905 }
904 906
905 907
906 #ifndef QT_NO_TRANSFORMATIONS 908 #ifndef QT_NO_TRANSFORMATIONS
907 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] ); 909 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
908 910
909 cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 911 std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
910 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl; 912 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
911 913
912 QWMatrix oldmat = m_painter-> worldMatrix ( ); 914 QWMatrix oldmat = m_painter-> worldMatrix ( );
913 m_painter-> setWorldMatrix ( mat, true ); 915 m_painter-> setWorldMatrix ( mat, true );
914 916
915#ifdef QWS 917#ifdef QWS
916 QPixmap pm; 918 QPixmap pm;