|
@@ -768,7 +768,6 @@ begin
|
|
|
Result:=DoGetRawImage(aIndex,aResolution,False);
|
|
|
end;
|
|
|
|
|
|
-
|
|
|
procedure TBaseCustomImageList.SetImage(aIndex: Integer; aResolution: Word; aImage: TFPCustomImage);
|
|
|
|
|
|
var
|
|
@@ -1023,7 +1022,6 @@ begin
|
|
|
FCache.Clear;
|
|
|
end;
|
|
|
|
|
|
-
|
|
|
{ TImageData }
|
|
|
|
|
|
function TImageData.GetHeight: Word;
|
|
@@ -1046,7 +1044,6 @@ begin
|
|
|
Result:=(FImageSource=isImageList) and assigned(FImageList);
|
|
|
end;
|
|
|
|
|
|
-
|
|
|
function TImageData.GetImageNameStored: Boolean;
|
|
|
begin
|
|
|
Result:=(FImageSource=isStore) and (FImageName<>'');
|
|
@@ -1277,8 +1274,6 @@ begin
|
|
|
FImageName:=AValue;
|
|
|
end;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
procedure TImageData.WriteData(Writer: TWriter);
|
|
|
|
|
|
Const
|
|
@@ -1354,7 +1349,7 @@ end;
|
|
|
procedure TImageData.DefineProperties(Filer: TFiler);
|
|
|
begin
|
|
|
inherited DefineProperties(Filer);
|
|
|
- Filer.DefineProperty('Data',@ReadData,@WriteData,(FImageSource=isData) and (Width<>0) and (Height<>0));
|
|
|
+ Filer.DefineProperty('Data',@ReadData,@WriteData,(FImageSource=isData) and (Width>0) and (Height>0));
|
|
|
end;
|
|
|
|
|
|
procedure TImageData.LoadFromFile(const aFilename: String);
|
|
@@ -1366,9 +1361,8 @@ begin
|
|
|
Img:=CreateData(0,0);
|
|
|
try
|
|
|
Img.LoadFromFile(aFileName);
|
|
|
- except
|
|
|
+ finally
|
|
|
Img.Free;
|
|
|
- Raise;
|
|
|
end;
|
|
|
ReplaceData(Img);
|
|
|
end;
|