summaryrefslogtreecommitdiffstats
path: root/src/gvcore
diff options
context:
space:
mode:
Diffstat (limited to 'src/gvcore')
-rw-r--r--src/gvcore/jpegformattype.cpp60
-rw-r--r--src/gvcore/mngformattype.cpp4
-rw-r--r--src/gvcore/pngformattype.cpp4
-rw-r--r--src/gvcore/qxcfi.cpp58
-rw-r--r--src/gvcore/xpm.cpp6
5 files changed, 66 insertions, 66 deletions
diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp
index 749ffb8..ce18820 100644
--- a/src/gvcore/jpegformattype.cpp
+++ b/src/gvcore/jpegformattype.cpp
@@ -103,7 +103,7 @@ struct JPEGSourceManager : public jpeg_source_mgr {
/* Do not replace boolean with bool, it's the libjpeg boolean type */
static boolean gvFillInputBuffer(j_decompress_ptr cinfo) {
#ifdef BUFFER_DEBUG
- qDebug("FillInputBuffer called!");
+ tqDebug("FillInputBuffer called!");
#endif
JPEGSourceManager* src = (JPEGSourceManager*)cinfo->src;
@@ -115,7 +115,7 @@ struct JPEGSourceManager : public jpeg_source_mgr {
src->bytes_in_buffer = 2;
src->next_input_byte = (JOCTET *) src->jpeg_buffer;
#ifdef BUFFER_DEBUG
- qDebug("...returning true!");
+ tqDebug("...returning true!");
#endif
return true;
} else {
@@ -127,7 +127,7 @@ struct JPEGSourceManager : public jpeg_source_mgr {
if(num_bytes <= 0) return; /* required noop */
#ifdef BUFFER_DEBUG
- qDebug("SkipInputData (%d) called!", num_bytes);
+ tqDebug("SkipInputData (%d) called!", num_bytes);
#endif
JPEGSourceManager* src = (JPEGSourceManager*)cinfo->src;
@@ -136,10 +136,10 @@ struct JPEGSourceManager : public jpeg_source_mgr {
unsigned int skipbytes = kMin(src->bytes_in_buffer, src->skip_input_bytes);
#ifdef BUFFER_DEBUG
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
- qDebug("skipbytes is now %d", skipbytes);
- qDebug("valid_buffer_length is before %d", src->valid_buffer_length);
- qDebug("bytes_in_buffer is %d", src->bytes_in_buffer);
+ tqDebug("skip_input_bytes is now %d", src->skip_input_bytes);
+ tqDebug("skipbytes is now %d", skipbytes);
+ tqDebug("valid_buffer_length is before %d", src->valid_buffer_length);
+ tqDebug("bytes_in_buffer is %d", src->bytes_in_buffer);
#endif
if(skipbytes < src->bytes_in_buffer) {
@@ -156,8 +156,8 @@ struct JPEGSourceManager : public jpeg_source_mgr {
cinfo->src->next_input_byte = (JOCTET *) src->jpeg_buffer;
cinfo->src->bytes_in_buffer = (size_t) src->valid_buffer_length;
#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_length is afterwards %d", src->valid_buffer_length);
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
+ tqDebug("valid_buffer_length is afterwards %d", src->valid_buffer_length);
+ tqDebug("skip_input_bytes is now %d", src->skip_input_bytes);
#endif
}
@@ -218,20 +218,20 @@ JPEGFormat::~JPEGFormat() {
int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* buffer, int length) {
#ifdef JPEG_DEBUG
- qDebug("JPEGFormat::decode(%p, %p, %p, %d)",
+ tqDebug("JPEGFormat::decode(%p, %p, %p, %d)",
&image, consumer, buffer, length);
#endif
if(mSourceManager.at_eof) {
#ifdef JPEG_DEBUG
- qDebug("at_eof, eating");
+ tqDebug("at_eof, eating");
#endif
return length;
}
if(setjmp(mErrorManager.jmp_buffer)) {
#ifdef JPEG_DEBUG
- qDebug("jump into state INVALID");
+ tqDebug("jump into state INVALID");
#endif
if(consumer) consumer->end();
@@ -242,7 +242,7 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
int consumed = kMin(length, MAX_BUFFER - mSourceManager.valid_buffer_length);
#ifdef BUFFER_DEBUG
- qDebug("consuming %d bytes", consumed);
+ tqDebug("consuming %d bytes", consumed);
#endif
// filling buffer with the new data
@@ -251,9 +251,9 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
if(mSourceManager.skip_input_bytes) {
#ifdef BUFFER_DEBUG
- qDebug("doing skipping");
- qDebug("valid_buffer_length %d", mSourceManager.valid_buffer_length);
- qDebug("skip_input_bytes %d", mSourceManager.skip_input_bytes);
+ tqDebug("doing skipping");
+ tqDebug("valid_buffer_length %d", mSourceManager.valid_buffer_length);
+ tqDebug("skip_input_bytes %d", mSourceManager.skip_input_bytes);
#endif
int skipbytes = kMin((size_t) mSourceManager.valid_buffer_length, mSourceManager.skip_input_bytes);
@@ -268,7 +268,7 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
// still more bytes to skip
if(mSourceManager.skip_input_bytes) {
- if(consumed <= 0) qDebug("ERROR!!!");
+ if(consumed <= 0) tqDebug("ERROR!!!");
return consumed;
}
@@ -278,7 +278,7 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
mDecompress.src->bytes_in_buffer = (size_t) mSourceManager.valid_buffer_length;
#ifdef BUFFER_DEBUG
- qDebug("buffer contains %d bytes", mSourceManager.valid_buffer_length);
+ tqDebug("buffer contains %d bytes", mSourceManager.valid_buffer_length);
#endif
if(mState == INIT) {
@@ -297,7 +297,7 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
mSourceManager.do_progressive = jpeg_has_multiple_scans( &mDecompress );
#ifdef JPEG_DEBUG
- qDebug( "**** DOPROGRESSIVE: %d", mSourceManager.do_progressive );
+ tqDebug( "**** DOPROGRESSIVE: %d", mSourceManager.do_progressive );
#endif
mDecompress.buffered_image = mSourceManager.do_progressive;
@@ -324,11 +324,11 @@ int JPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* b
}
#ifdef JPEG_DEBUG
- qDebug("will create a picture %d/%d in size", mDecompress.output_width, mDecompress.output_height);
+ tqDebug("will create a picture %d/%d in size", mDecompress.output_width, mDecompress.output_height);
#endif
#ifdef JPEG_DEBUG
- qDebug("ok, going to DECOMPRESS_STARTED");
+ tqDebug("ok, going to DECOMPRESS_STARTED");
#endif
mSourceManager.decoder_timestamp.start();
@@ -368,7 +368,7 @@ again:
if(mState == DO_OUTPUT_SCAN) {
if(image.isNull() || mSourceManager.decoding_done) {
#ifdef JPEG_DEBUG
- qDebug("complete in doOutputscan, eating..");
+ tqDebug("complete in doOutputscan, eating..");
#endif
return consumed;
}
@@ -381,7 +381,7 @@ again:
int completed_scanlines = mDecompress.output_scanline - oldoutput_scanline;
#ifdef JPEG_DEBUG
- qDebug("completed now %d scanlines", completed_scanlines);
+ tqDebug("completed now %d scanlines", completed_scanlines);
#endif
if ( mDecompress.output_components == 3 ) {
@@ -400,7 +400,7 @@ again:
if(consumer && completed_scanlines) {
TQRect r(0, oldoutput_scanline, mDecompress.output_width, completed_scanlines);
#ifdef JPEG_DEBUG
- qDebug("changing %d/%d %d/%d", r.x(), r.y(), r.width(), r.height());
+ tqDebug("changing %d/%d %d/%d", r.x(), r.y(), r.width(), r.height());
#endif
mSourceManager.change_rect |= r;
@@ -428,12 +428,12 @@ again:
mSourceManager.decoding_done = true;
}
#ifdef JPEG_DEBUG
- qDebug("one pass is completed, final_pass = %d, dec_done: %d, complete: %d",
+ tqDebug("one pass is completed, final_pass = %d, dec_done: %d, complete: %d",
mSourceManager.final_pass, mSourceManager.decoding_done, jpeg_input_complete(&mDecompress));
#endif
if(!mSourceManager.decoding_done) {
#ifdef JPEG_DEBUG
- qDebug("starting another one, input_scan_number is %d/%d", mDecompress.input_scan_number,
+ tqDebug("starting another one, input_scan_number is %d/%d", mDecompress.input_scan_number,
mDecompress.output_scan_number);
#endif
mSourceManager.decoder_timestamp.restart();
@@ -445,7 +445,7 @@ again:
if(mState == DO_OUTPUT_SCAN && mSourceManager.decoding_done) {
#ifdef JPEG_DEBUG
- qDebug("input is complete, cleaning up, returning..");
+ tqDebug("input is complete, cleaning up, returning..");
#endif
if ( consumer && !mSourceManager.change_rect.isEmpty() ) {
consumer->changed( mSourceManager.change_rect );
@@ -488,9 +488,9 @@ again:
}
#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_length is now %d", mSourceManager.valid_buffer_length);
- qDebug("bytes_in_buffer is now %d", mSourceManager.bytes_in_buffer);
- qDebug("consumed %d bytes", consumed);
+ tqDebug("valid_buffer_length is now %d", mSourceManager.valid_buffer_length);
+ tqDebug("bytes_in_buffer is now %d", mSourceManager.bytes_in_buffer);
+ tqDebug("consumed %d bytes", consumed);
#endif
if(mSourceManager.bytes_in_buffer
&& mSourceManager.jpeg_buffer != mSourceManager.next_input_byte) {
diff --git a/src/gvcore/mngformattype.cpp b/src/gvcore/mngformattype.cpp
index f94f475..f613f05 100644
--- a/src/gvcore/mngformattype.cpp
+++ b/src/gvcore/mngformattype.cpp
@@ -161,7 +161,7 @@ public:
mng_int32 iExtra2,
mng_pchar zErrortext )
{
- qWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d",
+ tqWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d",
iErrorcode,zErrortext,
(iChunkname>>24)&0xff,
(iChunkname>>16)&0xff,
@@ -505,7 +505,7 @@ void gvInitMngIO()
done = TRUE;
#ifndef TQT_NO_ASYNC_IMAGE_IO
globalMngFormatTypeObject = new MNGFormatType;
- qAddPostRoutine( gvCleanupMngIO );
+ tqAddPostRoutine( gvCleanupMngIO );
#endif
}
}
diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp
index ac40d87..77bf7b3 100644
--- a/src/gvcore/pngformattype.cpp
+++ b/src/gvcore/pngformattype.cpp
@@ -186,7 +186,7 @@ CALLBACK_CALL_TYPE user_chunk_callback(png_structp png_ptr,
static void qt_png_warning(png_structp /*png_ptr*/, png_const_charp message)
{
- qWarning("libpng warning: %s", message);
+ tqWarning("libpng warning: %s", message);
}
}
@@ -510,7 +510,7 @@ int PNGFormat::user_chunk(png_structp png,
png_bytep data, png_uint_32 length)
{
#if 0 // NOT SUPPORTED: experimental PNG animation.
- // qDebug("Got %ld-byte %s chunk", length, png->chunk_name);
+ // tqDebug("Got %ld-byte %s chunk", length, png->chunk_name);
if ( 0==qstrcmp((char*)png->chunk_name, "gIFg")
&& length == 4 ) {
diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
index 8e6559f..c4bf928 100644
--- a/src/gvcore/qxcfi.cpp
+++ b/src/gvcore/qxcfi.cpp
@@ -427,14 +427,14 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
xcf_io.readRawBytes( tag, sizeof(tag) );
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on header tag" );
+ tqDebug( "XCF: read failure on header tag" );
return;
}
xcf_io >> xcf_image.width >> xcf_image.height >> xcf_image.type;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on image info" );
+ tqDebug( "XCF: read failure on image info" );
return;
}
@@ -454,7 +454,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
xcf_io >> layer_offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer offsets" );
+ tqDebug( "XCF: read failure on layer offsets" );
return;
}
@@ -466,7 +466,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
xcf_image.num_layers = layer_offsets.size();
if ( layer_offsets.size() == 0 ) {
- qDebug( "XCF: no layers!" );
+ tqDebug( "XCF: no layers!" );
return;
}
@@ -481,7 +481,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
}
if ( !xcf_image.initialized ) {
- qDebug( "XCF: no visible layers!" );
+ tqDebug( "XCF: no visible layers!" );
return;
}
@@ -763,7 +763,7 @@ bool XCFImageFormat::loadImageProperties ( SafeDataStream& xcf_io,
TQByteArray bytes;
if ( !loadProperty( xcf_io, type, bytes ) ) {
- qDebug( "XCF: error loading global image properties" );
+ tqDebug( "XCF: error loading global image properties" );
return false;
}
@@ -833,7 +833,7 @@ bool XCFImageFormat::loadImageProperties ( SafeDataStream& xcf_io,
break;
default:
- qDebug( "XCF: unimplemented image property %d, size %d", type, bytes.size() );
+ tqDebug( "XCF: unimplemented image property %d, size %d", type, bytes.size() );
}
}
}
@@ -855,7 +855,7 @@ bool XCFImageFormat::loadLayer ( SafeDataStream& xcf_io, XCFImage& xcf_image )
xcf_io >> layer.width >> layer.height >> layer.type >> layer.name;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer" );
+ tqDebug( "XCF: read failure on layer" );
return false;
}
@@ -877,7 +877,7 @@ bool XCFImageFormat::loadLayer ( SafeDataStream& xcf_io, XCFImage& xcf_image )
xcf_io >> layer.hierarchy_offset >> layer.mask_offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer image offsets" );
+ tqDebug( "XCF: read failure on layer image offsets" );
return false;
}
@@ -933,7 +933,7 @@ bool XCFImageFormat::loadLayerProperties ( SafeDataStream& xcf_io, Layer& layer
TQByteArray bytes;
if ( !loadProperty( xcf_io, type, bytes ) ) {
- qDebug( "XCF: error loading layer properties" );
+ tqDebug( "XCF: error loading layer properties" );
return false;
}
@@ -988,7 +988,7 @@ bool XCFImageFormat::loadLayerProperties ( SafeDataStream& xcf_io, Layer& layer
break;
default:
- qDebug( "XCF: unimplemented layer property %d, size %d", type, bytes.size() );
+ tqDebug( "XCF: unimplemented layer property %d, size %d", type, bytes.size() );
}
}
}
@@ -1007,7 +1007,7 @@ bool XCFImageFormat::loadChannelProperties ( SafeDataStream& xcf_io, Layer& laye
TQByteArray bytes;
if ( !loadProperty( xcf_io, type, bytes ) ) {
- qDebug( "XCF: error loading channel properties" );
+ tqDebug( "XCF: error loading channel properties" );
return false;
}
@@ -1039,7 +1039,7 @@ bool XCFImageFormat::loadChannelProperties ( SafeDataStream& xcf_io, Layer& laye
break;
default:
- qDebug( "XCF: unimplemented channel property %d, size %d", type, bytes.size() );
+ tqDebug( "XCF: unimplemented channel property %d, size %d", type, bytes.size() );
}
}
}
@@ -1062,7 +1062,7 @@ bool XCFImageFormat::loadHierarchy ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> width >> height >> bpp >> offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer %s image header", layer.name );
+ tqDebug( "XCF: read failure on layer %s image header", layer.name );
return false;
}
@@ -1075,7 +1075,7 @@ bool XCFImageFormat::loadHierarchy ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> junk;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer %s level offsets", layer.name );
+ tqDebug( "XCF: read failure on layer %s level offsets", layer.name );
return false;
}
} while ( junk != 0 );
@@ -1108,7 +1108,7 @@ bool XCFImageFormat::loadLevel ( SafeDataStream& xcf_io, Layer& layer, TQ_INT32
xcf_io >> width >> height >> offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer %s level info", layer.name );
+ tqDebug( "XCF: read failure on layer %s level info", layer.name );
return false;
}
@@ -1118,7 +1118,7 @@ bool XCFImageFormat::loadLevel ( SafeDataStream& xcf_io, Layer& layer, TQ_INT32
for ( uint i = 0; i < layer.ncols; i++ ) {
if ( offset == 0 ) {
- qDebug( "XCF: incorrect number of tiles in layer %s", layer.name );
+ tqDebug( "XCF: incorrect number of tiles in layer %s", layer.name );
return false;
}
@@ -1129,7 +1129,7 @@ bool XCFImageFormat::loadLevel ( SafeDataStream& xcf_io, Layer& layer, TQ_INT32
xcf_io >> offset2;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer %s level offset look-ahead",
+ tqDebug( "XCF: read failure on layer %s level offset look-ahead",
layer.name );
return false;
}
@@ -1157,7 +1157,7 @@ bool XCFImageFormat::loadLevel ( SafeDataStream& xcf_io, Layer& layer, TQ_INT32
xcf_io >> offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on layer %s level offset", layer.name );
+ tqDebug( "XCF: read failure on layer %s level offset", layer.name );
return false;
}
}
@@ -1181,7 +1181,7 @@ bool XCFImageFormat::loadMask ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> width >> height >> name;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on mask info" );
+ tqDebug( "XCF: read failure on mask info" );
return false;
}
@@ -1194,7 +1194,7 @@ bool XCFImageFormat::loadMask ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> hierarchy_offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on mask image offset" );
+ tqDebug( "XCF: read failure on mask image offset" );
return false;
}
@@ -1245,7 +1245,7 @@ bool XCFImageFormat::loadTileRLE ( SafeDataStream& xcf_io, uchar* tile, int imag
if ( read_length<=0 ) {
delete[] xcfodata;
- qDebug( "XCF: read failure on tile" );
+ tqDebug( "XCF: read failure on tile" );
return false;
}
@@ -1326,7 +1326,7 @@ bool XCFImageFormat::loadTileRLE ( SafeDataStream& xcf_io, uchar* tile, int imag
bogus_rle:
- qDebug( "The run length encoding could not be decoded properly" );
+ tqDebug( "The run length encoding could not be decoded properly" );
delete[] xcfodata;
return false;
}
@@ -1425,7 +1425,7 @@ bool XCFImageFormat::loadProperty ( SafeDataStream& xcf_io, PropType& type,
type=static_cast<PropType>(tmp);
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property type" );
+ tqDebug( "XCF: read failure on property type" );
return false;
}
@@ -1445,13 +1445,13 @@ bool XCFImageFormat::loadProperty ( SafeDataStream& xcf_io, PropType& type,
TQ_UINT32 ignoredSize, ncolors;
xcf_io >> ignoredSize;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property %d size", type );
+ tqDebug( "XCF: read failure on property %d size", type );
return false;
}
xcf_io >> ncolors;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property %d size", type );
+ tqDebug( "XCF: read failure on property %d size", type );
return false;
}
xcf_io.device()->ungetch( ncolors & 0xff);
@@ -1475,7 +1475,7 @@ bool XCFImageFormat::loadProperty ( SafeDataStream& xcf_io, PropType& type,
xcf_io >> size >> factor >> digits;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property %d", type );
+ tqDebug( "XCF: read failure on property %d", type );
return false;
}
@@ -1483,7 +1483,7 @@ bool XCFImageFormat::loadProperty ( SafeDataStream& xcf_io, PropType& type,
xcf_io >> unit_strings;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property %d", type );
+ tqDebug( "XCF: read failure on property %d", type );
return false;
}
@@ -1497,7 +1497,7 @@ bool XCFImageFormat::loadProperty ( SafeDataStream& xcf_io, PropType& type,
xcf_io.readBytes( data, size );
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on property %d data, size %d", type, size );
+ tqDebug( "XCF: read failure on property %d data, size %d", type, size );
return false;
}
diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
index f9018b8..edb79e3 100644
--- a/src/gvcore/xpm.cpp
+++ b/src/gvcore/xpm.cpp
@@ -195,7 +195,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
for( currentColor=0; currentColor < ncols; ++currentColor ) {
if ( !read_xpm_string( buf, d, source, index ) ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "TQImage: XPM color specification missing");
+ tqWarning( "TQImage: XPM color specification missing");
#endif
return;
}
@@ -206,7 +206,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
i = nextColorSpec(buf);
if ( i < 0 ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "TQImage: XPM color specification is missing: %s", buf.data());
+ tqWarning( "TQImage: XPM color specification is missing: %s", buf.data());
#endif
return; // no c/g/g4/m/s specification at all
}
@@ -250,7 +250,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
for( int y=0; y<h; y++ ) {
if ( !read_xpm_string( buf, d, source, index ) ) {
#if defined(TQT_CHECK_RANGE)
- qWarning( "TQImage: XPM pixels missing on image line %d", y);
+ tqWarning( "TQImage: XPM pixels missing on image line %d", y);
#endif
return;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 01:20:12 +0000