diff options
Diffstat (limited to 'src/kernel/qpngio.cpp')
| -rw-r--r-- | src/kernel/qpngio.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index d391d5c4..8033030b 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -40,7 +40,7 @@ #include "ntqpngio.h" -#ifndef QT_NO_IMAGEIO_PNG +#ifndef TQT_NO_IMAGEIO_PNG #include "ntqasyncimageio.h" #include "ntqiodevice.h" @@ -411,7 +411,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) image.setDotsPerMeterX(png_get_x_pixels_per_meter(png_ptr,info_ptr)); image.setDotsPerMeterY(png_get_y_pixels_per_meter(png_ptr,info_ptr)); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT png_textp text_ptr; int num_text=0; png_get_text(png_ptr,info_ptr,&text_ptr,&num_text); @@ -484,7 +484,7 @@ void TQPNGImageWriter::setGamma(float g) } -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT static void set_text(const TQImage& image, png_structp png_ptr, png_infop info_ptr, bool short_not_long) { TQValueList<TQImageTextKeyLang> keys = image.textList(); @@ -684,14 +684,14 @@ should be able to comment this out. PNG_RESOLUTION_METER); } -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT // Write short texts early. set_text(image,png_ptr,info_ptr,TRUE); #endif png_write_info(png_ptr, info_ptr); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT // Write long texts later. set_text(image,png_ptr,info_ptr,FALSE); #endif @@ -935,7 +935,7 @@ bool TQPNGImagePacker::packImage(const TQImage& img) } -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO class TQPNGFormat : public TQImageFormat { public: @@ -1225,7 +1225,7 @@ void TQPNGFormat::end(png_structp png, png_infop info) image->setOffset(TQPoint(offx,offy)); image->setDotsPerMeterX(png_get_x_pixels_per_meter(png,info)); image->setDotsPerMeterY(png_get_y_pixels_per_meter(png,info)); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT png_textp text_ptr; int num_text=0; png_get_text(png,info,&text_ptr,&num_text); @@ -1248,7 +1248,7 @@ void TQPNGFormat::end(png_structp png, png_infop info) #ifdef PNG_USER_CHUNKS_SUPPORTED /* -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT static bool skip(png_uint_32& max, png_bytep& data) { while (*data) { @@ -1292,7 +1292,7 @@ int TQPNGFormat::user_chunk(png_structp png, Q_UNUSED( length ) #endif -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT /* libpng now supports this chunk. @@ -1328,12 +1328,12 @@ int TQPNGFormat::user_chunk(png_structp png, static TQPNGFormatType* globalPngFormatTypeObject = 0; -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO static bool done = FALSE; void qCleanupPngIO() { -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO if ( globalPngFormatTypeObject ) { delete globalPngFormatTypeObject; globalPngFormatTypeObject = 0; @@ -1348,7 +1348,7 @@ void qInitPngIO() done = TRUE; TQImageIO::defineIOHandler( "PNG", "^.PNG\r", 0, read_png_image, write_png_image); -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO globalPngFormatTypeObject = new TQPNGFormatType; #endif tqAddPostRoutine( qCleanupPngIO ); @@ -1361,4 +1361,4 @@ void qt_zlib_compression_hack() uncompress(0,0,0,0); } -#endif // QT_NO_IMAGEIO_PNG +#endif // TQT_NO_IMAGEIO_PNG |