diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp index f881bf8e0..010951278 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp @@ -148,8 +148,8 @@ static const char *const ps_header = "TQCIcolor length 3 idiv 1 sub{/TQCIindex ED/x TQCIindex 3 mul d TQCIgray\n" "TQCIindex TQCIcolor x get 0.30 mul TQCIcolor x 1 add get 0.59 mul TQCIcolor x 2\n" "add get 0.11 mul add add cvi put}for TQCIgray image}ie}D/di{gsave TR 1 i 1 eq\n" -"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagetqmask BkCol SC\n" -"imagetqmask}{pop false 3 1 roll imagetqmask}ie}{dup false ne{/languagelevel\n" +"{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagemask BkCol SC\n" +"imagemask}{pop false 3 1 roll imagemask}ie}{dup false ne{/languagelevel\n" "where{pop languagelevel 3 ge}{false}ie}{false}ie{/ma ED 8 eq{/dc[0 1]d\n" "/DeviceGray}{/dc[0 1 0 1 0 1]d/DeviceRGB}ie scs/im ED/mt ED/h ED/w ED/id 7\n" "DB/ImageType 1 d/Width w d/Height h d/ImageMatrix mt d/DataSource im d\n" @@ -1379,7 +1379,7 @@ public: void resetDrawingTools( TQPainter * ); void emitHeader( bool finished ); void setFont( const TQFont &, int script ); - void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &tqmask ); + void drawImage( TQPainter *, float x, float y, float w, float h, const TQImage &img, const TQImage &mask ); void initPage( TQPainter *paint ); void flushPage( bool last = FALSE ); @@ -5807,7 +5807,7 @@ static const char * psJoin( TQt::PenJoinStyle p ) { void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, float h, - const TQImage &img, const TQImage &tqmask ) + const TQImage &img, const TQImage &mask ) { if ( !w || !h || img.isNull() ) return; @@ -5831,7 +5831,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, while( suby < height ) { drawImage(paint, x, y + suby/scaleY, w, TQMIN( subheight, height-suby )/scaleY, img.copy( 0, suby, width, TQMIN( subheight, height-suby ) ), - tqmask.isNull() ? tqmask : tqmask.copy( 0, suby, width, TQMIN( subheight, height-suby ) )); + mask.isNull() ? mask : mask.copy( 0, suby, width, TQMIN( subheight, height-suby ) )); suby += subheight; } } else { @@ -5839,10 +5839,10 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, int size = 0; const char *bits; - if ( !tqmask.isNull() ) { - out = ::compress( tqmask, TRUE ); + if ( !mask.isNull() ) { + out = ::compress( mask, TRUE ); size = (width+7)/8*height; - pageStream << "/tqmask " << size << " string uc\n"; + pageStream << "/mask " << size << " string uc\n"; ps_r7( pageStream, out, out.size() ); pageStream << "d\n"; } @@ -5862,7 +5862,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, ps_r7( pageStream, out, out.size() ); pageStream << "d\n" << width << ' ' << height << "[" << scaleX << " 0 0 " << scaleY << " 0 0]sl " - << bits << (!tqmask.isNull() ? "tqmask " : "false ") + << bits << (!mask.isNull() ? "mask " : "false ") << x << ' ' << y << " di\n"; } } @@ -6486,10 +6486,10 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) TQRect r = *p[0].rect; TQImage img; img = *(p[1].pixmap); - TQImage tqmask; - if ( p[1].pixmap->tqmask() ) - tqmask = *(p[1].pixmap->tqmask()); - d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask); + TQImage mask; + if ( p[1].pixmap->mask() ) + mask = *(p[1].pixmap->mask()); + d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask); break; } case PdcDrawImage: { @@ -6497,12 +6497,12 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) break; TQRect r = *(p[0].rect); TQImage img = *(p[1].image); - TQImage tqmask; + TQImage mask; #ifndef TQT_NO_IMAGE_DITHER_TO_1 if ( img.hasAlphaBuffer() ) - tqmask = img.createAlphaMask(); + mask = img.createAlphaMask(); #endif - d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, tqmask); + d->drawImage(paint, r.x(), r.y(), r.width(), r.height(), img, mask); break; } case PdcSetBkColor: |