paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-31 04:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: raise exception if bitmap is not completely written to disk (bug #8260)

Browse Source 
git-svn-id: trunk@11392 -
This commit is contained in:
vincents 2007-06-27 11:01:23 +00:00
parent ea4b652818
commit 296e81dda3
20 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/graphics.pp
View File

@ -34,8 +34,9 @@ interface
uses
SysUtils, Math, Types, Classes, Contnrs, FPCAdds,
FPImage, FPReadPNG, FPWritePNG, FPReadBMP, FPWriteBMP, FPReadPNM, FPWritePNM,
IntfGraphics, FPCanvas,
FPImgCmn, FPImage, FPCanvas,
FPReadPNG, FPWritePNG, FPReadBMP, FPWriteBMP, FPReadPNM, FPWritePNM,
IntfGraphics,
AvgLvlTree,
LCLStrConsts, LCLType, LCLProc, LMessages, LCLIntf, LResources, LCLResCache,
GraphType, GraphMath, InterfaceBase;

6
lcl/include/bitmap.inc
View File

@ -814,12 +814,16 @@ procedure TBitmap.WriteStreamWithFPImage(Stream: TStream; WriteSize: boolean;
end;
procedure DoWriteOriginal;
var
BytesWritten: Int64;
begin
DoWriteStreamSize(Stream, NtoLE(LongInt(FImage.SaveStream.Size)));
FImage.SaveStream.Position:=0;
if Stream is TMemoryStream then
TMemoryStream(Stream).SetSize(Stream.Position+FImage.SaveStream.Size);
Stream.CopyFrom(FImage.SaveStream,FImage.SaveStream.Size);
BytesWritten:=Stream.CopyFrom(FImage.SaveStream,FImage.SaveStream.Size);
if BytesWritten<>FImage.SaveStream.Size then
raise FPImageException.Create(rsErrorWhileSavingBitmap);
end;
var

8
lcl/include/lclintf.inc
View File

@ -482,22 +482,22 @@ end;
procedure NotifyUser(const DialogMessage : String; DialogType : longint);
begin
PromptUser(DialogMessage, DialogType, [idButtonOK], -1, -1);
PromptUser(DialogMessage, DialogType, [idButtonOK], 0, -1);
end;
procedure NotifyUser(const DialogCaption, DialogMessage : String; DialogType : longint);
begin
PromptUser(DialogCaption, DialogMessage, DialogType, [idButtonOK], -1, -1);
PromptUser(DialogCaption, DialogMessage, DialogType, [idButtonOK], 0, -1);
end;
procedure NotifyUserAtXY(const DialogMessage : String; DialogType : longint; X, Y : Longint);
begin
PromptUserAtXY(DialogMessage, DialogType, [idButtonOK], -1, -1, X, Y);
PromptUserAtXY(DialogMessage, DialogType, [idButtonOK], 0, -1, X, Y);
end;
procedure NotifyUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; X, Y : Longint);
begin
PromptUserAtXY(DialogCaption, DialogMessage, DialogType, [idButtonOK], -1, -1, X, Y);
PromptUserAtXY(DialogCaption, DialogMessage, DialogType, [idButtonOK], 0, -1, X, Y);
end;
function PromptUser(const DialogMessage : String; DialogType : longint; Buttons : Array of Longint;

4
lcl/languages/lclstrconsts.ca.po
View File

@ -289,6 +289,10 @@ msgstr ""
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr ""

4
lcl/languages/lclstrconsts.de.po
View File

@ -292,6 +292,10 @@ msgstr "Fehler beim Lesen %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Fehler beim Ausführen von %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Fehler:"

4
lcl/languages/lclstrconsts.es.po
View File

@ -288,6 +288,10 @@ msgstr "Error leyendo %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Error:"

4
lcl/languages/lclstrconsts.fi.po
View File

@ -278,6 +278,10 @@ msgstr ""
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Virhe:"

4
lcl/languages/lclstrconsts.fr.po
View File

@ -290,6 +290,10 @@ msgstr "Erreur de lecture %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Erreur en exécutant %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Erreur:"

4
lcl/languages/lclstrconsts.id.po
View File

@ -291,6 +291,10 @@ msgstr "Kesalahan pembacaan %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Kesalahan saat mengeksekusi %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Kesalahan:"

4
lcl/languages/lclstrconsts.it.po
View File

@ -288,6 +288,10 @@ msgstr "Errore nella lettura di %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Errore eseguendo %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Errore:"

4
lcl/languages/lclstrconsts.nl.po
View File

@ -278,6 +278,10 @@ msgstr "Fout tijdens het lezen %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Fout:"

4
lcl/languages/lclstrconsts.pb.po
View File

@ -278,6 +278,10 @@ msgstr "Erro na leitura %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Erro ao executar %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Erro:"

4
lcl/languages/lclstrconsts.pl.po
View File

@ -293,6 +293,10 @@ msgstr "Błąd odczytu %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Błąd:"

4
lcl/languages/lclstrconsts.pliso.po
View File

@ -289,6 +289,10 @@ msgstr "B
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "B³±d:"

4
lcl/languages/lclstrconsts.plwin.po
View File

@ -289,6 +289,10 @@ msgstr "B
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "B³¹d:"

4
lcl/languages/lclstrconsts.po
View File

@ -278,6 +278,10 @@ msgstr ""
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr ""

4
lcl/languages/lclstrconsts.ru.po
View File

@ -289,6 +289,10 @@ msgstr "Ошибка чтения %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "Ошибка при выполнении %s%s%s:%s%s"
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Ошибка:"

4
lcl/languages/lclstrconsts.ua.po
View File

@ -278,6 +278,10 @@ msgstr "Помилка читання %s%s%s: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr ""
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "Помилка:"

4
lcl/languages/lclstrconsts.zh-cn.po
View File

@ -291,6 +291,10 @@ msgstr "读取 %s%s%s 错误: %s"
msgid "Error while executing %s%s%s:%s%s"
msgstr "当执行 %s%s%s 时错误:%s%s "
#: lclstrconsts:rserrorwhilesavingbitmap
msgid "Error while saving bitmap."
msgstr ""
#: lclstrconsts:rswin32error
msgid "Error:"
msgstr "错误:"

1
lcl/lclstrconsts.pas
View File

@ -184,6 +184,7 @@ ResourceString
rsIsAlreadyAssociatedWith = '%s is already associated with %s';
rsCanvasDoesNotAllowDrawing = 'Canvas does not allow drawing';
rsUnsupportedBitmapFormat = 'Unsupported bitmap format.';
rsErrorWhileSavingBitmap = 'Error while saving bitmap.';
rsNoWidgetSet = 'No widgetset object. '
+'Plz check if the unit "interfaces" was added to the programs uses clause.';
rsPressOkToIgnoreAndRiskDataCorruptionPressCancelToK = '%s%sPress Ok to '