Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5946 → Rev 5947

/branches/Version13x/Scribus/scribus/scimgdataloader_tiff.cpp
154,6 → 154,13
m_imageInfoRecord.exifInfo.thumbnail = QImage();
m_imageInfoRecord.exifDataValid = true;
 
if( xres <= 1.0 || yres <= 1.0 )
{
xres = yres = 72.0;
QFileInfo qfi(fn);
qWarning("Warning: %s may be corrupted", qfi.fileName().local8Bit());
}
 
if (!m_image.create(widtht,heightt,32))
{
TIFFClose(tif);
/branches/Version13x/Scribus/scribus/scimgdataloader_jpeg.cpp
1,4 → 1,5
#include <qfile.h>
#include <qfileinfo.h>
#include <setjmp.h>
#include "scconfig.h"
#include "scimgdataloader_jpeg.h"
156,6 → 157,12
xres = cinfo.X_density * 2.54;
yres = cinfo.Y_density * 2.54;
}
if( xres <= 1.0 || yres <= 1.0 )
{
xres = yres = 72.0;
QFileInfo qfi(fn);
qWarning("Warning: %s may be corrupted", qfi.fileName().local8Bit());
}
m_imageInfoRecord.xres = qRound(xres);
m_imageInfoRecord.yres = qRound(yres);
if (cinfo.output_components == 4)
216,6 → 223,12
m_image.setDotsPerMeterX( int(100. * cinfo.X_density) );
m_image.setDotsPerMeterY( int(100. * cinfo.Y_density) );
}
if( xres <= 1.0 || yres <= 1.0 )
{
xres = yres = 72.0;
QFileInfo qfi(fn);
qWarning("Warning: %s may be corrupted", qfi.fileName().local8Bit());
}
m_imageInfoRecord.xres = qRound(xres);
m_imageInfoRecord.yres = qRound(yres);
if (cinfo.output_components == 4)