summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/corelib/canvastest/fpgcanvas.lpi2
-rw-r--r--examples/corelib/canvastest/fpgcanvas.lpr3
-rw-r--r--src/corelib/gfxbase.pas9
3 files changed, 8 insertions, 6 deletions
diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvastest/fpgcanvas.lpi
index 71f908fb..f81836d4 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpi
+++ b/examples/corelib/canvastest/fpgcanvas.lpi
@@ -2,7 +2,7 @@
<CONFIG>
<ProjectOptions>
<PathDelim Value="/"/>
- <Version Value="5"/>
+ <Version Value="6"/>
<General>
<Flags>
<SaveOnlyProjectUnits Value="True"/>
diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvastest/fpgcanvas.lpr
index 790fa4e6..4c217f62 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpr
+++ b/examples/corelib/canvastest/fpgcanvas.lpr
@@ -134,9 +134,8 @@ begin
Canvas.DrawImagePart(190, 210, bmp, 32, 0, 32, 21);
Canvas.DrawImagePart(230, 210, bmp, 64, 0, 32, 21);
-// Canvas.StretchDraw(150, 240, 160, 21, bmp);
Canvas.StretchDraw(150, 240, 300, 50, bmp);
-
+
Canvas.DrawImage(150, 300, dst);
Canvas.StretchDraw(180, 300, 70, 70, dst);
Canvas.StretchDraw(265, 300, 230, 25, bmp);
diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas
index 3669ca94..9ae7f503 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/gfxbase.pas
@@ -1277,8 +1277,8 @@ end;
procedure TfpgBaseInterpolation.Execute(x, y, w, h: integer);
begin
-// tempimage := TfpgImageBase.Create;
-// tempimage.AllocateImage(image.ColorDepth, w, image.Height);
+ tempimage := TfpgImageBase.Create;
+ tempimage.AllocateImage(image.ColorDepth, w, image.Height);
xfactor := image.Width / w;
yfactor := image.Height / h;
@@ -1296,7 +1296,7 @@ end;
destructor TfpgBaseInterpolation.Destroy;
begin
-// tempimage.Free;
+ tempimage.Free;
inherited Destroy;
end;
@@ -1399,7 +1399,10 @@ begin
dww := FWidth;
FImageDataSize := dww * FHeight * 4;
+ FImageData := nil;
GetMem(FImageData, FImageDataSize);
+ if FImageData = nil then
+ raise Exception.Create('Failed to allocate ' + IntToStr(FImageDataSize) + 'bytes of memory for FImageData');
end;
procedure TfpgImageBase.AllocateMask;