Attachment #22674 for bug #58356

View | Details | Raw Unified | Return to bug 58356
Collapse All | Expand All

Lines 1-5 Link Here

(-)qt-x11-free-3.3.2/src/kernel/qasyncimageio.cpp (-1 / +2 lines)
1	/****************************************************************************	1	/****************************************************************************
2	** $Id: qt/qasyncimageio.cpp 3.3.2 edited Dec 6 17:56 $	2	** $Id: qt/qasyncimageio.cpp 3.3.3 edited Jul 27 15:31 $
3	**	3	**
4	** Implementation of asynchronous image/movie loading classes	4	** Implementation of asynchronous image/movie loading classes
5	**	5	**
Lines 992-997 int QGIFFormat::decode(QImage& img, QIma Link Here
992	accum = 0;	992	accum = 0;
993	bitcount = 0;	993	bitcount = 0;
994	sp = stack;	994	sp = stack;
		995	firstcode = oldcode = 0;
995	needfirst = FALSE;	996	needfirst = FALSE;
996	out_of_bounds = FALSE;	997	out_of_bounds = FALSE;
997	}	998	}

Lines 1-5 Link Here

(-)qt-x11-free-3.3.2/src/kernel/qimage.cpp (-11 / +45 lines)
1	/****************************************************************************	1	/****************************************************************************
2	** $Id: qt/qimage.cpp 3.3.2 edited Mar 29 14:59 $	2	** $Id: qt/qimage.cpp 3.3.3 edited Jul 28 14:16 $
3	**	3	**
4	** Implementation of QImage and QImageIO classes	4	** Implementation of QImage and QImageIO classes
5	**	5	**
Lines 730-735 QImage QImage::copy(int x, int y, int w, Link Here
730	that->setAlphaBuffer( TRUE );	730	that->setAlphaBuffer( TRUE );
731	}	731	}
732	image.setAlphaBuffer(hasAlphaBuffer());	732	image.setAlphaBuffer(hasAlphaBuffer());
		733	image.data->dpmx = dotsPerMeterX();
		734	image.data->dpmy = dotsPerMeterY();
		735	image.data->offset = offset();
		736	#ifndef QT_NO_IMAGE_TEXT
		737	if ( data->misc ) {
		738	image.data->misc = new QImageDataMisc;
		739	*image.data->misc = misc();
		740	}
		741	#endif
733	return image;	742	return image;
734	}	743	}
735		744
Lines 4818-4823 bool read_dib( QDataStream& s, int offse Link Here
4818	if ( comp == BMP_RLE8 ) { // run length compression	4827	if ( comp == BMP_RLE8 ) { // run length compression
4819	int x=0, y=0, b;	4828	int x=0, y=0, b;
4820	register uchar *p = line[h-1];	4829	register uchar *p = line[h-1];
		4830	const uchar *endp = line[h-1]+w;
4821	while ( y < h ) {	4831	while ( y < h ) {
4822	if ( (b=d->getch()) == EOF )	4832	if ( (b=d->getch()) == EOF )
4823	break;	4833	break;
Lines 4835-4843 bool read_dib( QDataStream& s, int offse Link Here
4835	case 2: // delta (jump)	4845	case 2: // delta (jump)
4836	x += d->getch();	4846	x += d->getch();
4837	y += d->getch();	4847	y += d->getch();
		4848
		4849	// Protection
		4850	if ( (uint)x >= (uint)w )
		4851	x = w-1;
		4852	if ( (uint)y >= (uint)h )
		4853	y = h-1;
		4854
4838	p = line[h-y-1] + x;	4855	p = line[h-y-1] + x;
4839	break;	4856	break;
4840	default: // absolute mode	4857	default: // absolute mode
		4858	// Protection
		4859	if ( p + b > endp )
		4860	b = endp-p;
		4861
4841	if ( d->readBlock( (char *)p, b ) != b )	4862	if ( d->readBlock( (char *)p, b ) != b )
4842	return FALSE;	4863	return FALSE;
4843	if ( (b & 1) == 1 )	4864	if ( (b & 1) == 1 )
Lines 4846-4851 bool read_dib( QDataStream& s, int offse Link Here
4846	p += b;	4867	p += b;
4847	}	4868	}
4848	} else { // encoded mode	4869	} else { // encoded mode
		4870	// Protection
		4871	if ( p + b > endp )
		4872	b = endp-p;
		4873
4849	memset( p, d->getch(), b ); // repeat pixel	4874	memset( p, d->getch(), b ); // repeat pixel
4850	x += b;	4875	x += b;
4851	p += b;	4876	p += b;
Lines 5641-5646 static bool read_xpm_string( QCString &b Link Here
5641	}	5666	}
5642		5667
5643		5668
		5669
		5670	static int nextColorSpec(const QCString & buf)
		5671	{
		5672	int i = buf.find(" c ");
		5673	if (i < 0)
		5674	i = buf.find(" g ");
		5675	if (i < 0)
		5676	i = buf.find(" g4 ");
		5677	if (i < 0)
		5678	i = buf.find(" m ");
		5679	if (i < 0)
		5680	i = buf.find(" s ");
		5681	return i;
		5682	}
		5683
5644	//	5684	//
5645	// INTERNAL	5685	// INTERNAL
5646	//	5686	//
Lines 5697-5719 static void read_xpm_image_or_array( QIm Link Here
5697	index = buf.left( cpp );	5737	index = buf.left( cpp );
5698	buf = buf.mid( cpp ).simplifyWhiteSpace().lower();	5738	buf = buf.mid( cpp ).simplifyWhiteSpace().lower();
5699	buf.prepend( " " );	5739	buf.prepend( " " );
5700	i = buf.find( " c " );	5740	i = nextColorSpec(buf);
5701	if ( i < 0 )
5702	i = buf.find( " g " );
5703	if ( i < 0 )
5704	i = buf.find( " g4 " );
5705	if ( i < 0 )
5706	i = buf.find( " m " );
5707	if ( i < 0 ) {	5741	if ( i < 0 ) {
5708	#if defined(QT_CHECK_RANGE)	5742	#if defined(QT_CHECK_RANGE)
5709	qWarning( "QImage: XPM color specification is missing: %s", buf.data());	5743	qWarning( "QImage: XPM color specification is missing: %s", buf.data());
5710	#endif	5744	#endif
5711	return; // no c/g/g4/m specification at all	5745	return; // no c/g/g4/m/s specification at all
5712	}	5746	}
5713	buf = buf.mid( i+3 );	5747	buf = buf.mid( i+3 );
5714	// Strip any other colorspec	5748	// Strip any other colorspec
5715	int end = buf.find(' ', 4);	5749	int end = nextColorSpec(buf);
5716	if ( end >= 0 )	5750	if (end != -1)
5717	buf.truncate(end);	5751	buf.truncate(end);
5718	buf = buf.stripWhiteSpace();	5752	buf = buf.stripWhiteSpace();
5719	if ( buf == "none" ) {	5753	if ( buf == "none" ) {

Lines 1-5 Link Here

(-)qt-x11-free-3.3.2/src/kernel/qjpegio.cpp (-29 / +52 lines)
1	/****************************************************************************	1	/****************************************************************************
2	** $Id: qt/qjpegio.cpp 3.3.2 edited Oct 13 2003 $	2	** $Id: qt/qjpegio.cpp 3.3.3 edited Jul 21 14:16 $
3	**	3	**
4	** Implementation of JPEG QImage IOHandler	4	** Implementation of JPEG QImage IOHandler
5	**	5	**
Lines 254-268 void read_jpeg_image(QImageIO* iio) Link Here
254	scaleSize( sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode );	254	scaleSize( sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode );
255	// qDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr );	255	// qDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr );
256		256
		257	bool created = FALSE;
257	if ( cinfo.output_components == 3 \|\| cinfo.output_components == 4) {	258	if ( cinfo.output_components == 3 \|\| cinfo.output_components == 4) {
258	image.create( sWidth, sHeight, 32 );	259	created = image.create( sWidth, sHeight, 32 );
259	} else if ( cinfo.output_components == 1 ) {	260	} else if ( cinfo.output_components == 1 ) {
260	image.create( sWidth, sHeight, 8, 256 );	261	created = image.create( sWidth, sHeight, 8, 256 );
261	for (int i=0; i<256; i++)	262	for (int i=0; i<256; i++)
262	image.setColor(i, qRgb(i,i,i));	263	image.setColor(i, qRgb(i,i,i));
263	} else {	264	} else {
264	// Unsupported format	265	// Unsupported format
265	}	266	}
		267	if (!created)
		268	image = QImage();
266		269
267	if (!image.isNull()) {	270	if (!image.isNull()) {
268	QImage tmpImage( cinfo.output_width, 1, 32 );	271	QImage tmpImage( cinfo.output_width, 1, 32 );
Lines 296-348 void read_jpeg_image(QImageIO* iio) Link Here
296	}	299	}
297	}	300	}
298	(void) jpeg_finish_decompress(&cinfo);	301	(void) jpeg_finish_decompress(&cinfo);
299	}	302	}
300		303
301	} else {	304	} else {
302		305
		306	bool created = false;
303	if ( cinfo.output_components == 3 \|\| cinfo.output_components == 4) {	307	if ( cinfo.output_components == 3 \|\| cinfo.output_components == 4) {
304	image.create( cinfo.output_width, cinfo.output_height, 32 );	308	created = image.create( cinfo.output_width, cinfo.output_height, 32 );
305	} else if ( cinfo.output_components == 1 ) {	309	} else if ( cinfo.output_components == 1 ) {
306	image.create( cinfo.output_width, cinfo.output_height, 8, 256 );	310	created = image.create( cinfo.output_width, cinfo.output_height, 8, 256 );
307	for (int i=0; i<256; i++)	311	for (int i=0; i<256; i++)
308	image.setColor(i, qRgb(i,i,i));	312	image.setColor(i, qRgb(i,i,i));
309	} else {	313	} else {
310	// Unsupported format	314	// Unsupported format
311	}	315	}
		316	if (!created)
		317	image = QImage();
312		318
313	if (!image.isNull()) {	319	if (!image.isNull()) {
314	uchar** lines = image.jumpTable();	320	uchar** lines = image.jumpTable();
315	while (cinfo.output_scanline < cinfo.output_height)	321	while (cinfo.output_scanline < cinfo.output_height)
316	(void) jpeg_read_scanlines(&cinfo,	322	(void) jpeg_read_scanlines(&cinfo,
317	lines + cinfo.output_scanline,	323	lines + cinfo.output_scanline,
318	cinfo.output_height);	324	cinfo.output_height);
319	(void) jpeg_finish_decompress(&cinfo);	325	(void) jpeg_finish_decompress(&cinfo);
320	}
321		326
322	if ( cinfo.output_components == 3 ) {	327	if ( cinfo.output_components == 3 ) {
323	// Expand 24->32 bpp.	328	// Expand 24->32 bpp.
324	for (uint j=0; j<cinfo.output_height; j++) {	329	for (uint j=0; j<cinfo.output_height; j++) {
325	uchar in = image.scanLine(j) + cinfo.output_width 3;	330	uchar in = image.scanLine(j) + cinfo.output_width 3;
326	QRgb out = (QRgb)image.scanLine(j);	331	QRgb out = (QRgb)image.scanLine(j);
327		332
328	for (uint i=cinfo.output_width; i--; ) {	333	for (uint i=cinfo.output_width; i--; ) {
329	in-=3;	334	in-=3;
330	out[i] = qRgb(in[0], in[1], in[2]);	335	out[i] = qRgb(in[0], in[1], in[2]);
331	}	336	}
332	}	337	}
333	}	338	}
		339	}
334	}	340	}
335		341
336	if ( cinfo.density_unit == 1 ) {	342	if (!image.isNull()) {
337	image.setDotsPerMeterX( int(100. * cinfo.X_density / 2.54) );	343	if ( cinfo.density_unit == 1 ) {
338	image.setDotsPerMeterY( int(100. * cinfo.Y_density / 2.54) );	344	image.setDotsPerMeterX( int(100. * cinfo.X_density / 2.54) );
339	} else if ( cinfo.density_unit == 2 ) {	345	image.setDotsPerMeterY( int(100. * cinfo.Y_density / 2.54) );
340	image.setDotsPerMeterX( int(100. * cinfo.X_density) );	346	} else if ( cinfo.density_unit == 2 ) {
341	image.setDotsPerMeterY( int(100. * cinfo.Y_density) );	347	image.setDotsPerMeterX( int(100. * cinfo.X_density) );
342	}	348	image.setDotsPerMeterY( int(100. * cinfo.Y_density) );
		349	}
		350	}
343		351
344	iio->setImage(image);	352	iio->setImage(image);
345	iio->setStatus(0);	353	iio->setStatus(image.isNull());
346	}	354	}
347		355
348	jpeg_destroy_decompress(&cinfo);	356	jpeg_destroy_decompress(&cinfo);
Lines 476-481 void write_jpeg_image(QImageIO* iio) Link Here
476	}	484	}
477		485
478	jpeg_set_defaults(&cinfo);	486	jpeg_set_defaults(&cinfo);
		487
		488	float diffInch = QABS(image.dotsPerMeterX()2.54/100. - qRound(image.dotsPerMeterX()2.54/100.))
		489	+ QABS(image.dotsPerMeterY()2.54/100. - qRound(image.dotsPerMeterY()2.54/100.));
		490	float diffCm = (QABS(image.dotsPerMeterX()/100. - qRound(image.dotsPerMeterX()/100.))
		491	+ QABS(image.dotsPerMeterY()/100. - qRound(image.dotsPerMeterY()/100.)))*2.54;
		492	if (diffInch < diffCm) {
		493	cinfo.density_unit = 1; // dots/inch
		494	cinfo.X_density = qRound(image.dotsPerMeterX()*2.54/100.);
		495	cinfo.Y_density = qRound(image.dotsPerMeterY()*2.54/100.);
		496	} else {
		497	cinfo.density_unit = 2; // dots/cm
		498	cinfo.X_density = (image.dotsPerMeterX()+50) / 100;
		499	cinfo.Y_density = (image.dotsPerMeterY()+50) / 100;
		500	}
		501
479	int quality = iio->quality() >= 0 ? QMIN(iio->quality(),100) : 75;	502	int quality = iio->quality() >= 0 ? QMIN(iio->quality(),100) : 75;
480	#if defined(Q_OS_UNIXWARE)	503	#if defined(Q_OS_UNIXWARE)
481	jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);	504	jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);

Return to bug 58356