Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10136 → Rev 10135

/trunk/Scribus/scribus/pdflib_core.cpp
46,7 → 46,6
#include "rc4.h"
 
#include "commonstrings.h"
#include "formatutils.h"
#include "page.h"
#include "pageitem.h"
#include "bookmwin.h"
5988,7 → 5987,7
}
else
{ */
if ((extensionIndicatesPDF(ext) || extensionIndicatesEPSorPS(ext)) && (c->pixm.imgInfo.type != 7))
if (((ext == "eps") || (ext == "epsi") || (ext == "pdf")) && (c->pixm.imgInfo.type != 7))
{
QString tmpFile = QDir::convertSeparators(ScPaths::getTempFileDir() + "sc.png");
if (Options.RecalcPic)
6415,7 → 6414,7
sxn = SharedImages[fn].sxa * sx / SharedImages[fn].xa;
syn = SharedImages[fn].sya * sy / SharedImages[fn].ya;
}
if (extensionIndicatesPDF(ext) || extensionIndicatesEPSorPS(ext))// compensate gsResolution setting
if ((ext == "eps") || (ext == "epsi") || (ext == "pdf"))// compensate gsResolution setting
{
sxn = PrefsManager::instance()->appPrefs.gs_Resolution / 72.0 * sxn;
syn = PrefsManager::instance()->appPrefs.gs_Resolution / 72.0 * syn;