From be3411f2110c5abe041279f2a86c713aef721111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Fri, 20 Feb 2015 19:59:09 +0000 Subject: [PATCH] [GB.PAINT] * BUG: The PathExtents.Merge() method does not crash anymore. [GB.V4L] * BUG: Fix type in error messages. git-svn-id: svn://localhost/gambas/trunk@6903 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.report2/.settings | 196 ---------------------------------- gb.v4l/src/CWebcam.c | 4 +- main/lib/draw/cpaint.c | 2 + 3 files changed, 4 insertions(+), 198 deletions(-) delete mode 100644 comp/src/gb.report2/.settings diff --git a/comp/src/gb.report2/.settings b/comp/src/gb.report2/.settings deleted file mode 100644 index 3be233929..000000000 --- a/comp/src/gb.report2/.settings +++ /dev/null @@ -1,196 +0,0 @@ -[Bookmarks] -ReportContainer=[560,822] - -[Breakpoints] -Count=0 - -[DebugWindow] -Count=1 -DebugWindow[1]="Me.Children[i + 1]" - -[DebugWindow/$aSections] -Geometry=[-55,269,210,210] - -[DebugWindow/$aSections[0]] -Geometry=[354,0,210,210] - -[DebugWindow/$aSections[0].Ctrl] -Geometry=[872,411,274,210] - -[DebugWindow/$hFont] -Geometry=[0,0,210,210] - -[DebugWindow/$hReport] -Geometry=[554,335,758,561] - -[DebugWindow/CSection.Children] -Geometry=[1313,366,210,210] - -[DebugWindow/CSection.Children[16]] -Geometry=[1116,173,210,210] - -[DebugWindow/CSection.Children[22]] -Geometry=[1326,206,210,210] - -[DebugWindow/Control] -ShowHidden=True -Geometry=[0,0,210,210] - -[DebugWindow/Me] -Geometry=[19,13,294,210] - -[DebugWindow/Me.BackGround._PaintBrush(X1, Y1, X2, Y2)] -Geometry=[-7,-10,210,210] - -[DebugWindow/Me.BackGround._PaintBrush(X1, Y1, X2, Y2).Matrix] -Geometry=[7,4,210,210] - -[DebugWindow/Me.BoxShadow] -Geometry=[0,0,210,210] - -[DebugWindow/Me.Children] -Geometry=[108,220,210,210] - -[DebugWindow/Me.Children[i + 1]] -Geometry=[0,0,210,210] - -[DebugWindow/Object.Parent(Me)] -Geometry=[-7,-10,210,210] - -[DebugWindow/Parent] -Geometry=[-7,-10,210,210] - -[DebugWindow/Report1] -ShowHidden=True -Geometry=[-7,-10,210,210] - -[DebugWindow/ReportVBox(Me).Children] -Geometry=[7,4,294,210] - -[DebugWindow/ReportVBox(Me).Children[0]] -Geometry=[21,18,294,210] - -[DebugWindow/ReportVBox(ReportVBox(Me).Children[0]).Children] -Geometry=[35,32,294,210] - -[DebugWindow/String] -Geometry=[0,0,210,210] - -[DebugWindow/TCont] -Geometry=[-7,-10,210,210] - -[DebugWindow/TSizeParse[s]] -Geometry=[-7,-10,210,210] - -[DebugWindow/_ObjectFromId] -Geometry=[-7,420,256,282] - -[DebugWindow/_ObjectFromId["0"]] -Geometry=[7,4,210,210] - -[DebugWindow/aPageItems] -Geometry=[-7,-10,210,210] - -[DebugWindow/aPageItems[0]] -Geometry=[7,4,210,210] - -[DebugWindow/aPageItems[1]] -Geometry=[7,4,210,210] - -[DebugWindow/aPageItems[9]] -Geometry=[7,4,210,210] - -[DebugWindow/aPageItems[9].Ctrl] -Geometry=[21,18,210,210] - -[DebugWindow/ctrl] -Geometry=[-7,-10,342,210] - -[DebugWindow/hChild] -Geometry=[1120,176,473,436] - -[DebugWindow/hChild._GetSizeHints(AvailableW, AvailableH - fHeight, AvailableW, AvailableH, j)] -Geometry=[-7,114,210,210] - -[DebugWindow/hChildHints] -Geometry=[0,0,210,210] - -[DebugWindow/hMyHints] -Geometry=[-7,-10,210,210] - -[DebugWindow/hRep] -Geometry=[-7,247,210,210] - -[DebugWindow/hReport] -Geometry=[-7,-10,210,210] - -[DebugWindow/hSizeInt] -Geometry=[222,282,210,210] - -[DebugWindow/hchild] -Geometry=[-7,-10,210,210] - -[DebugWindow/hchild.Margin] -Geometry=[502,541,210,210] - -[DebugWindow/hrc] -Geometry=[1133,212,210,210] - -[DebugWindow/htmpInts] -Geometry=[28,264,210,210] - -[DebugWindow/ochild] -Geometry=[-7,-10,210,210] - -[FCommit] -LastCommit="[GB.REPORT2]\n* OPT: Layout does not take account of BoxShadows margins.\n---- Cette ligne et les suivantes seront ignorées ----\n\nM .info\nM .src/ReportContainer.class\nM .src/ReportControl.class\nM .src/ReportFrame.class\nM .src/Types/BoxShadow/ReportBoxShadow.class" - -[OpenFile] -Active=33 -File[1]=".src/ReportSvgImage.class:62.2" -Count=34 -File[2]=".src/ReportImage.class:86.0" -File[3]=".src/ReportGridView.class:8.11" -File[4]=".src/Tests/FMain.form" -File[5]=".src/Tests/Module1.module:0.0" -File[6]=".src/Report.class:708.2" -File[7]=".src/ReportLabel.class:9.0" -File[8]=".src/ReportPanel.class:14.34" -File[9]=".src/Viewer/FPreview.class:63.26" -File[10]=".src/Viewer/ReportView.class:29.2" -File[11]=".src/ReportContainer.class:1045.3" -File[12]=".src/Types/TSizeParse.class:49.2" -File[13]=".src/Optional/Align.class:0.0" -File[14]=".src/Optional/Line.class:0.0" -File[15]=".src/Tools/CPrint.class:0.0" -File[16]=".src/Types/TControl.class:14.17" -File[17]=".src/ReportLine.class:44.0" -File[18]=".src/Tools/MUtil.module:12.18" -File[19]=".src/Types/ReportGridView/_ReportGridView_Rows.class:109.0" -File[20]=".src/ReportFrame.class:368.3" -File[21]=".src/Viewer/FPreview.form" -File[22]=".src/Types/BoxShadow/ReportBoxShadow.class:204.0" -File[23]=".src/Types/BoxShadow/_ReportBoxShadow.class:11.0" -File[24]=".src/ReportControl.class:438.2" -File[25]=".src/ReportVBox.class:0.0" -File[26]=".src/Tests/Report3.report" -File[27]=".src/Tests/Report3.class:17.28" -File[28]="capture12.png" -File[29]=".src/Tests/Report1.report" -File[30]=".src/Tests/Report5.report" -File[31]=".connection/Connection2.connection" -File[32]=".src/Tests/Report5.class:2.0" -File[33]=".src/Tests/Report51.class:173.6" -File[34]=".src/Tests/Report51.report" - -[VersionControl] -User="gambix" -RememberPassword=1 - -[Watches] -Count=4 -Watch[1]="AvailableW" -Watch[2]="Left(s)" -Watch[3]="fHeight - fMaxSpc" -Watch[4]="fTH - fMaxSpc" - diff --git a/gb.v4l/src/CWebcam.c b/gb.v4l/src/CWebcam.c index 54cff4c27..d05e637cc 100644 --- a/gb.v4l/src/CWebcam.c +++ b/gb.v4l/src/CWebcam.c @@ -1415,7 +1415,7 @@ BEGIN_METHOD(VideoDevice_Save,GB_STRING File; GB_INTEGER Quality;) if (!File) { - GB.Error("Unable to open file for writting"); + GB.Error("Unable to open file for writing"); return; } @@ -1448,7 +1448,7 @@ BEGIN_METHOD(VideoDevice_Save,GB_STRING File; GB_INTEGER Quality;) fd=fopen(File, "w"); if (!fd) { - GB.Error("Unable to open file for writting"); + GB.Error("Unable to open file for writing"); return; } diff --git a/main/lib/draw/cpaint.c b/main/lib/draw/cpaint.c index 1ad74298c..79c0ce157 100644 --- a/main/lib/draw/cpaint.c +++ b/main/lib/draw/cpaint.c @@ -252,6 +252,8 @@ BEGIN_METHOD(PaintExtents_Merge, GB_OBJECT extents) if (extents->ext.x2 > XTHIS->ext.x2) XTHIS->ext.x2 = extents->ext.x2; if (extents->ext.y2 > XTHIS->ext.y2) XTHIS->ext.y2 = extents->ext.y2; + GB.ReturnObject(XTHIS); + END_METHOD GB_DESC PaintExtentsDesc[] =