author | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
commit | ec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (unidiff) | |
tree | a65e8adc4edd60d7822f75e8b574e8e97596773c /noncore/unsupported | |
parent | 3f1d60609657ea69bda453f5c820a23ee5375ab8 (diff) | |
download | opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.zip opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.gz opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.bz2 |
namespace and include fix for uses of iostream in STL
-rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 12 |
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 | |||
@@ -1,45 +1,47 @@ | |||
1 | ///======================================================================== | 1 | ///======================================================================== |
2 | // | 2 | // |
3 | // QOutputDev.cc | 3 | // QOutputDev.cc |
4 | // | 4 | // |
5 | // Copyright 1996 Derek B. Noonburg | 5 | // Copyright 1996 Derek B. Noonburg |
6 | // CopyRight 2002 Robert Griebl | 6 | // CopyRight 2002 Robert Griebl |
7 | // | 7 | // |
8 | //======================================================================== | 8 | //======================================================================== |
9 | 9 | ||
10 | #ifdef __GNUC__ | 10 | #ifdef __GNUC__ |
11 | #pragma implementation | 11 | #pragma implementation |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #include <aconf.h> | 14 | #include <aconf.h> |
15 | #include <stdio.h> | 15 | #include <stdio.h> |
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" |
28 | #include "UnicodeMap.h" | 30 | #include "UnicodeMap.h" |
29 | #include "CharCodeToUnicode.h" | 31 | #include "CharCodeToUnicode.h" |
30 | #include "FontFile.h" | 32 | #include "FontFile.h" |
31 | #include "Error.h" | 33 | #include "Error.h" |
32 | #include "TextOutputDev.h" | 34 | #include "TextOutputDev.h" |
33 | #include "QOutputDev.h" | 35 | #include "QOutputDev.h" |
34 | 36 | ||
35 | 37 | ||
36 | #include <qpixmap.h> | 38 | #include <qpixmap.h> |
37 | #include <qimage.h> | 39 | #include <qimage.h> |
38 | #include <qpainter.h> | 40 | #include <qpainter.h> |
39 | #include <qdict.h> | 41 | #include <qdict.h> |
40 | #include <qtimer.h> | 42 | #include <qtimer.h> |
41 | #include <qapplication.h> | 43 | #include <qapplication.h> |
42 | #include <qclipboard.h> | 44 | #include <qclipboard.h> |
43 | 45 | ||
44 | //#define QPDFDBG(x) x // special debug mode | 46 | //#define QPDFDBG(x) x // special debug mode |
45 | #define QPDFDBG(x) // normal compilation | 47 | #define QPDFDBG(x) // normal compilation |
@@ -649,49 +651,49 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, | |||
649 | QPDFDBG( printf ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( ))); | 651 | QPDFDBG( printf ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( ))); |
650 | } | 652 | } |
651 | } | 653 | } |
652 | 654 | ||
653 | if (( uLen == 1 ) && ( str [0] == ' ' )) | 655 | if (( uLen == 1 ) && ( str [0] == ' ' )) |
654 | return; | 656 | return; |
655 | 657 | ||
656 | 658 | ||
657 | fp_t m11, m12, m21, m22; | 659 | fp_t m11, m12, m21, m22; |
658 | 660 | ||
659 | state-> getFontTransMat ( &m11, &m12, &m21, &m22 ); | 661 | state-> getFontTransMat ( &m11, &m12, &m21, &m22 ); |
660 | m11 *= state-> getHorizScaling ( ); | 662 | m11 *= state-> getHorizScaling ( ); |
661 | m12 *= state-> getHorizScaling ( ); | 663 | m12 *= state-> getHorizScaling ( ); |
662 | 664 | ||
663 | fp_t fsize = m_painter-> font ( ). pixelSize ( ); | 665 | fp_t fsize = m_painter-> font ( ). pixelSize ( ); |
664 | 666 | ||
665 | #ifndef QT_NO_TRANSFORMATIONS | 667 | #ifndef QT_NO_TRANSFORMATIONS |
666 | QWMatrix oldmat; | 668 | QWMatrix oldmat; |
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; |
680 | y1 = 0; | 682 | y1 = 0; |
681 | } | 683 | } |
682 | #endif | 684 | #endif |
683 | 685 | ||
684 | QPen oldpen = m_painter-> pen ( ); | 686 | QPen oldpen = m_painter-> pen ( ); |
685 | 687 | ||
686 | if (!( state-> getRender ( ) & 1 )) { | 688 | if (!( state-> getRender ( ) & 1 )) { |
687 | QPen fillpen = oldpen; | 689 | QPen fillpen = oldpen; |
688 | 690 | ||
689 | fillpen. setColor ( m_painter-> brush ( ). color ( )); | 691 | fillpen. setColor ( m_painter-> brush ( ). color ( )); |
690 | m_painter-> setPen ( fillpen ); | 692 | m_painter-> setPen ( fillpen ); |
691 | } | 693 | } |
692 | 694 | ||
693 | if ( fsize > 5 ) | 695 | if ( fsize > 5 ) |
694 | m_painter-> drawText ( lrint ( x1 ), lrint ( y1 ), str ); | 696 | m_painter-> drawText ( lrint ( x1 ), lrint ( y1 ), str ); |
695 | else | 697 | else |
696 | m_painter-> fillRect ( lrint ( x1 ), lrint ( y1 ), lrint ( QMAX( fp_t(1), dx1 )), lrint ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( )); | 698 | m_painter-> fillRect ( lrint ( x1 ), lrint ( y1 ), lrint ( QMAX( fp_t(1), dx1 )), lrint ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( )); |
697 | 699 | ||
@@ -756,50 +758,50 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, | |||
756 | 758 | ||
757 | if ( ctm [0] < 0 ) | 759 | if ( ctm [0] < 0 ) |
758 | scanline += ( width - 1 ); | 760 | scanline += ( width - 1 ); |
759 | 761 | ||
760 | for ( int x = 0; x < width; x++ ) { | 762 | for ( int x = 0; x < width; x++ ) { |
761 | Guchar alpha; | 763 | Guchar alpha; |
762 | 764 | ||
763 | imgStr-> getPixel ( &alpha ); | 765 | imgStr-> getPixel ( &alpha ); |
764 | 766 | ||
765 | if ( invert ) | 767 | if ( invert ) |
766 | alpha ^= 1; | 768 | alpha ^= 1; |
767 | 769 | ||
768 | *scanline = ( alpha == 0 ) ? 0xff000000 | val : val; | 770 | *scanline = ( alpha == 0 ) ? 0xff000000 | val : val; |
769 | 771 | ||
770 | ctm [0] < 0 ? scanline-- : scanline++; | 772 | ctm [0] < 0 ? scanline-- : scanline++; |
771 | } | 773 | } |
772 | ctm [3] > 0 ? scanlines-- : scanlines++; | 774 | ctm [3] > 0 ? scanlines-- : scanlines++; |
773 | 775 | ||
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; |
788 | pm. convertFromImage ( img ); | 790 | pm. convertFromImage ( img ); |
789 | m_painter-> drawPixmap ( 0, 0, pm ); | 791 | m_painter-> drawPixmap ( 0, 0, pm ); |
790 | #else | 792 | #else |
791 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); | 793 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); |
792 | #endif | 794 | #endif |
793 | 795 | ||
794 | m_painter-> setWorldMatrix ( oldmat ); | 796 | m_painter-> setWorldMatrix ( oldmat ); |
795 | 797 | ||
796 | #else | 798 | #else |
797 | if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { | 799 | if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { |
798 | QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); | 800 | QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); |
799 | } | 801 | } |
800 | else { | 802 | else { |
801 | int x = lrint ( ctm [4] ); | 803 | int x = lrint ( ctm [4] ); |
802 | int y = lrint ( ctm [5] ); | 804 | int y = lrint ( ctm [5] ); |
803 | 805 | ||
804 | int w = lrint ( ctm [0] ); | 806 | int w = lrint ( ctm [0] ); |
805 | int h = lrint ( ctm [3] ); | 807 | int h = lrint ( ctm [3] ); |
@@ -885,50 +887,50 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi | |||
885 | 887 | ||
886 | uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff ); | 888 | uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff ); |
887 | 889 | ||
888 | if ( maskColors ) { | 890 | if ( maskColors ) { |
889 | for ( int k = 0; k < nComps; ++k ) { | 891 | for ( int k = 0; k < nComps; ++k ) { |
890 | if (( pixBuf [k] < maskColors [2 * k] ) || ( pixBuf [k] > maskColors [2 * k] )) { | 892 | if (( pixBuf [k] < maskColors [2 * k] ) || ( pixBuf [k] > maskColors [2 * k] )) { |
891 | val |= 0xff000000; | 893 | val |= 0xff000000; |
892 | break; | 894 | break; |
893 | } | 895 | } |
894 | } | 896 | } |
895 | } | 897 | } |
896 | *scanline = val; | 898 | *scanline = val; |
897 | 899 | ||
898 | ctm [0] < 0 ? scanline-- : scanline++; | 900 | ctm [0] < 0 ? scanline-- : scanline++; |
899 | } | 901 | } |
900 | ctm [3] > 0 ? scanlines-- : scanlines++; | 902 | ctm [3] > 0 ? scanlines-- : scanlines++; |
901 | 903 | ||
902 | qApp-> processEvents ( ); | 904 | qApp-> processEvents ( ); |
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; |
917 | pm. convertFromImage ( img ); | 919 | pm. convertFromImage ( img ); |
918 | m_painter-> drawPixmap ( 0, 0, pm ); | 920 | m_painter-> drawPixmap ( 0, 0, pm ); |
919 | #else | 921 | #else |
920 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); | 922 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); |
921 | #endif | 923 | #endif |
922 | 924 | ||
923 | m_painter-> setWorldMatrix ( oldmat ); | 925 | m_painter-> setWorldMatrix ( oldmat ); |
924 | 926 | ||
925 | #else // QT_NO_TRANSFORMATIONS | 927 | #else // QT_NO_TRANSFORMATIONS |
926 | 928 | ||
927 | if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { | 929 | if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) { |
928 | QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); | 930 | QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" )); |
929 | } | 931 | } |
930 | else { | 932 | else { |
931 | int x = lrint ( ctm [4] ); | 933 | int x = lrint ( ctm [4] ); |
932 | int y = lrint ( ctm [5] ); | 934 | int y = lrint ( ctm [5] ); |
933 | 935 | ||
934 | int w = lrint ( ctm [0] ); | 936 | int w = lrint ( ctm [0] ); |