Skip to content

Fix GxDrawBitMap aspectRatio and image format detection in PDFPig #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claudiamurialdo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix GxDrawBitMap aspectRatio and image format detection in PDFPig #1264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 60 additions & 37 deletions dotnet/src/dotnetcore/GxPdfReportsCS/PDFReportPDFPig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,26 +195,41 @@ public override void GxDrawBitMap(string bitmap, int left, int top, int right, i
{
try
{
string imageType = Path.GetExtension(bitmap).Substring(1);
string imageType = Path.GetExtension(bitmap).Substring(1).ToLowerInvariant();

float rightAux = (float)convertScale(right);
float bottomAux = (float)convertScale(bottom);
float leftAux = (float)convertScale(left);
float topAux = (float)convertScale(top);

float llx = leftAux + leftMargin;
float lly = (float) pageBuilder.PageSize.TopRight.Y - bottomAux - topMargin - bottomMargin;
float lly = (float)pageBuilder.PageSize.TopRight.Y - bottomAux - topMargin - bottomMargin;
float boxWidth = rightAux - leftAux;
float boxHeight = bottomAux - topAux;

byte[] imageBytes = null;
try
{
imageBytes = LoadImageBytes(ref bitmap);
}
catch (Exception) { }

float width;
float height;
if (aspectRatio == 0)
if (aspectRatio == 0 || imageBytes == null)
{
width = rightAux - leftAux;
height = bottomAux - topAux;
width = boxWidth;
height = boxHeight;
}
else
{
width = (rightAux - leftAux) * aspectRatio;
height = (bottomAux - topAux) * aspectRatio;
using (var ms = new MemoryStream(imageBytes))
using (var bmp = new Bitmap(ms))
{
float scale = Math.Min(boxWidth / bmp.Width, boxHeight / bmp.Height);
width = bmp.Width * scale;
height = bmp.Height * scale;
}
}

PdfRectangle position = new PdfRectangle(llx, lly, llx + width, lly + height);
Expand All @@ -229,40 +244,18 @@ public override void GxDrawBitMap(string bitmap, int left, int top, int right, i
{
try
{
byte[] imageBytes;
if (!Path.IsPathRooted(bitmap))
if (imageBytes != null)
{
if (PathUtil.IsAbsoluteUrl(bitmap))
{
imageBytes = HttpHelper.DownloadFile(bitmap, out _);
}
else
{
string bitmapPath = Path.Combine(defaultRelativePrepend, bitmap);
if (File.Exists(bitmapPath))
{
imageBytes = File.ReadAllBytes(bitmapPath);
bitmap = bitmapPath;
}
else
{
bitmapPath = Path.Combine(webAppDir, bitmap);
imageBytes = File.ReadAllBytes(bitmapPath);
bitmap = bitmapPath;
}
}
bool isJpeg = imageType == "jpeg" || imageType == "jpg";
image = isJpeg ? pageBuilder.AddJpeg(imageBytes, position) : pageBuilder.AddPng(imageBytes, position);
}
else
else if (PathUtil.IsAbsoluteUrl(bitmap))
{
imageBytes = File.ReadAllBytes(bitmap);
image = AddImageFromURL(bitmap, position);
}
image = imageType == "jpeg" ? pageBuilder.AddJpeg(imageBytes, position) : pageBuilder.AddPng(imageBytes, position);
}
catch (Exception)
{
image = AddImageFromURL(bitmap, position);
}
if (image == null)
catch (Exception) { }
if (image == null && PathUtil.IsAbsoluteUrl(bitmap))
{
image = AddImageFromURL(bitmap, position);
}
Expand Down Expand Up @@ -300,6 +293,36 @@ private AddedImage AddImageFromURL(string url, PdfRectangle position)
return image;
}

private byte[] LoadImageBytes(ref string bitmap)
{
if (!Path.IsPathRooted(bitmap))
{
if (PathUtil.IsAbsoluteUrl(bitmap))
{
return HttpHelper.DownloadFile(bitmap, out _);
}
else
{
string bitmapPath = Path.Combine(defaultRelativePrepend, bitmap);
if (File.Exists(bitmapPath))
{
bitmap = bitmapPath;
return File.ReadAllBytes(bitmapPath);
}
else
{
bitmapPath = Path.Combine(webAppDir, bitmap);
bitmap = bitmapPath;
return File.ReadAllBytes(bitmapPath);
}
}
}
else
{
return File.ReadAllBytes(bitmap);
}
}

public override void GxAttris(string fontName, int fontSize, bool fontBold, bool fontItalic, bool fontUnderline, bool fontStrikethru, int pen, int foreRed, int foreGreen, int foreBlue, int backMode, int backRed, int backGreen, int backBlue)
{
bool isCJK = false;
Expand Down
Loading