Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 23270 → Rev 23269

/branches/Version14x/Scribus/scribus/pdflib_core.cpp
7014,6 → 7014,8
bool found = false;
bool alphaM = false;
bool realCMYK = false;
bool bitmapFromGS = false;
bool isEmbeddedPDF = false;
bool hasGrayProfile = false;
QString profInUse = Profil;
int afl = Options.Resolution;
7035,8 → 7037,6
ImInfo.ya = y;
ImInfo.origXsc = c->imageXScale();
ImInfo.origYsc = c->imageYScale();
ImInfo.isBitmapFromGS = false;
ImInfo.isEmbeddedPDF = false;
ShIm ImInfo2;
ImInfo2.origXsc = c->imageXScale();
ImInfo2.origYsc = c->imageYScale();
7075,7 → 7075,7
}
else
imageLoaded = PDF_EmbeddedPDF(c, fn, sx, sy, x, y, fromAN, Profil, Embedded, Intent, ImInfo, output);
ImInfo.isEmbeddedPDF = true;
isEmbeddedPDF = true;
ImInfo.Page = c->pixm.imgInfo.actualPageNumber;
}
if(!imageLoaded && extensionIndicatesPDF(ext) && c->effectsInUse.count() == 0 && Options.embedPDF)
7085,7 → 7085,7
{
if ((extensionIndicatesPDF(ext) || extensionIndicatesEPSorPS(ext)) && (c->pixm.imgInfo.type != ImageType7))
{
ImInfo.isBitmapFromGS = true;
bitmapFromGS = true;
if (Options.RecalcPic)
{
afl = qMin(Options.PicRes, Options.Resolution);
7588,13 → 7588,28
ImInfo = SharedImages[fn];
ImInfo.sxa *= sx / ImInfo.xa;
ImInfo.sya *= sy / ImInfo.ya;
/*
ImRes = SharedImages[fn].ResNum;
ImWid = SharedImages[fn].Width;
ImHei = SharedImages[fn].Height;
aufl = SharedImages[fn].reso;
sxn = SharedImages[fn].sxa * sx / SharedImages[fn].xa;
syn = SharedImages[fn].sya * sy / SharedImages[fn].ya;
*/
}
QString embedPre = "";
if ((ImInfo.isBitmapFromGS) || (ImInfo.isEmbeddedPDF)) // compensate gsResolution setting
if ((bitmapFromGS) || (isEmbeddedPDF)) // compensate gsResolution setting
{
if (ImInfo.isEmbeddedPDF)
if (isEmbeddedPDF)
{
// #9268 : per specs default color space is grayscale
/*if (Options.isGrayscale)
embedPre = "0 g 0 G";
else if (Options.UseRGB)
embedPre = "0 0 0 rg 0 0 0 RG";
else
embedPre = "0 0 0 0 k 0 0 0 0 K";*/
embedPre = "0 g 0 G";
embedPre += " 1 w 0 J 0 j [] 0 d\n"; // add default graphics stack parameters pdftex relies on them
}
if (c->asLatexFrame())
/branches/Version14x/Scribus/scribus/pdflib_core.h
77,8 → 77,6
double ya;
double origXsc;
double origYsc;
bool isBitmapFromGS;
bool isEmbeddedPDF;
QMap<int, ImageLoadRequest> RequestProps;
};