namespace and include fix for uses of iostream in STL

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 @@
 ///========================================================================
 //
 // QOutputDev.cc
 //
 // Copyright 1996 Derek B. Noonburg
 // CopyRight 2002 Robert Griebl
 //
 //========================================================================
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
 
 #include <aconf.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
+#include <iostream>
+
 #include "GString.h"
 #include "Object.h"
 #include "Stream.h"
 #include "Link.h"
 #include "GfxState.h"
 #include "GfxFont.h"
 #include "UnicodeMap.h"
 #include "CharCodeToUnicode.h"
 #include "FontFile.h"
 #include "Error.h"
 #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
@@ -649,49 +651,49 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
                                 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 ( );
                 
                 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;
+                        std::cerr << std::endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
                                                 
                         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 ( lrint ( x1 ), lrint ( y1 ), str );
                 else
                         m_painter-> fillRect ( lrint ( x1 ), lrint ( y1 ), lrint ( QMAX( fp_t(1), dx1 )), lrint ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( ));
                 
@@ -756,50 +758,50 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
         
                 if ( ctm [0] < 0 )
                         scanline += ( width - 1 );
         
                 for ( int x = 0; x < width; x++ ) {
                         Guchar alpha;
                 
                         imgStr-> getPixel ( &alpha );
                         
                         if ( invert )
                                 alpha ^= 1;
                                 
                         *scanline = ( alpha == 0 ) ? 0xff000000 | val : val;
                         
                         ctm [0] < 0 ? scanline-- : scanline++;
                 }
                 ctm [3] > 0 ? scanlines-- : scanlines++;
 
                 qApp-> processEvents ( );
         }
                         
         #ifndef QT_NO_TRANSFORMATIONS           
         QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
         
-        cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 
-                 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl;
+        std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+                 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
                  
         QWMatrix oldmat = m_painter-> worldMatrix ( );
         m_painter-> setWorldMatrix ( mat, true );
 
 #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 )) {
                 QPDFDBG( printf (  "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" ));
         }
         else {
                 int x = lrint ( ctm [4] );
                 int y = lrint ( ctm [5] );
                 
                 int w = lrint ( ctm [0] );
                 int h = lrint ( ctm [3] );
@@ -885,50 +887,50 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
                         
                         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++;
                 }
                 ctm [3] > 0 ? scanlines-- : scanlines++;
                 
                 qApp-> processEvents ( );
         }
 
 
         #ifndef QT_NO_TRANSFORMATIONS           
         QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
 
-        cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 
-                 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl;
+        std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+                 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
 
         QWMatrix oldmat = m_painter-> worldMatrix ( );
         m_painter-> setWorldMatrix ( mat, true );
 
 #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 // QT_NO_TRANSFORMATIONS
 
         if (( ctm [1] < -0.1 ) || ( ctm [1] > 0.1 ) || ( ctm [2] < -0.1 ) || ( ctm [2] > 0.1 )) {
                 QPDFDBG( printf ( "### ROTATED / SHEARED / ETC -- CANNOT DISPLAY THIS IMAGE\n" ));
         }
         else {
                 int x = lrint ( ctm [4] );
                 int y = lrint ( ctm [5] );
                 
                 int w = lrint ( ctm [0] );