Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 20870 → Rev 20871

/branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp
76,7 → 76,7
jpeg_save_markers(&cinfo, ICC_MARKER, 0xFFFF);
jpeg_read_header(&cinfo, true);
unsigned int EmbedLen = 0;
unsigned char* EmbedBuffer;
unsigned char* EmbedBuffer = 0;
if (read_jpeg_marker(ICC_MARKER,&cinfo, &EmbedBuffer, &EmbedLen))
{
QByteArray profArray = QByteArray((const char*) EmbedBuffer, EmbedLen);
224,7 → 224,7
m_imageInfoRecord.exifDataValid = false;
m_imageInfoRecord.exifInfo.thumbnail = QImage();
unsigned int EmbedLen = 0;
unsigned char* EmbedBuffer;
unsigned char* EmbedBuffer = 0;
if (read_jpeg_marker(ICC_MARKER,&cinfo, &EmbedBuffer, &EmbedLen))
{
QByteArray profArray = QByteArray((const char*) EmbedBuffer, EmbedLen);
239,8 → 239,7
m_imageInfoRecord.isEmbedded = false;
m_imageInfoRecord.profileName = "";
}
unsigned int PhotoshopLen = 0;
unsigned char * PhotoshopBuffer;
 
if (cinfo.density_unit == 0)
{
xres = 72;
284,10 → 283,10
m_imageInfoRecord.colorspace = ColorSpaceGray;
m_imageInfoRecord.progressive = jpeg_has_multiple_scans(&cinfo);
 
unsigned int PhotoshopLen = 0;
unsigned char * PhotoshopBuffer = 0;
if (read_jpeg_marker(PHOTOSHOP_MARKER,&cinfo, &PhotoshopBuffer, &PhotoshopLen) )
{
if (PhotoshopLen != 0)
{
bool savEx = m_imageInfoRecord.exifDataValid;
QByteArray arrayPhot(PhotoshopLen, ' ');
arrayPhot = QByteArray::fromRawData((const char*)PhotoshopBuffer,PhotoshopLen);
352,6 → 351,7
m_imageInfoRecord.valid = (m_imageInfoRecord.PDSpathData.size())>0?true:false; // The only interest is vectormask
arrayPhot.clear();
free( PhotoshopBuffer );
PhotoshopBuffer = 0;
if (m_imageInfoRecord.exifDataValid && !m_imageInfoRecord.exifInfo.thumbnail.isNull() && thumbnail)
{
jpeg_destroy_decompress(&cinfo);
362,7 → 362,6
m_imageInfoRecord.exifDataValid = savEx;
fromPS = true;
}
}
if ( cinfo.output_components == 3 || cinfo.output_components == 4)
m_image = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_ARGB32 );
else if ( cinfo.output_components == 1 )