github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

PdfDraw: Minor improvement of JPEGDraw

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11773 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-02-09 22:52:45 +00:00
parent a01b3a4e85
commit 10ef7e047f
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/PdfDraw/PdfDraw.cpp
View file

@ -614,7 +614,11 @@ String PdfDraw::Finish(const PdfSignatureInfo *sign)
const Image& m = images[i];
if(m.GetSerialId() == JPEGDummy().GetSerialId()) {
String jpg = jpeg[jpegi++];
Size isz = StreamRaster::LoadStringAny(jpg).GetSize();
StringStream ss(jpg);
One<StreamRaster> r = StreamRaster::OpenAny(ss);
Size isz(1, 1);
if(r)
isz = r->GetSize();
BeginObj();
out << "<< " << " /Width " << isz.cx << " /Height " << isz.cy
<< " /Length " << jpg.GetLength()

2
uppsrc/RichText/RichImage.cpp
View file

@ -165,7 +165,7 @@ Image RichPNG::ToImage(const Value& data, Size sz, void *) const
if(IsString(data)) {
ImageAnyDraw iw(sz);
Paint(data, iw, sz);
return iw;
return iw;
}
Image x = Image(data);
Size outsz(min(sz.cx, 4 * x.GetWidth()), min(sz.cy, 4 * x.GetHeight()));