Merge pull request #138 from bgrabitmap/dev-lazpaint

Dev lazpaint 7.1.1
bgrabitmap · Apr 10, 2020 · 81e1126 · 81e1126
2 parents 2feccdf + 7461862
commit 81e1126
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/lazpaint/lazpaint.lpi b/lazpaint/lazpaint.lpi
@@ -26,6 +26,7 @@
       <MinorVersionNr Value="1"/>
       <CharSet Value="04B0"/>
       <StringTable CompanyName="http://sourceforge.net/projects/lazpaint/" ProductName="LazPaint" InternalName="lazpaint" OriginalFilename="lazpaint.exe"/>
+      <RevisionNr Value="1"/>
     </VersionInfo>
     <BuildModes Count="8">
       <Item1 Name="Debug" Default="True"/>

diff --git a/lazpaint/lazpaintembeddedpack.lpk b/lazpaint/lazpaintembeddedpack.lpk
@@ -26,7 +26,7 @@
         </Debugging>
       </Linking>
     </CompilerOptions>
-    <Version Major="7" Minor="1"/>
+    <Version Major="7" Minor="1" Release="1"/>
     <Files Count="94">
       <Item1>
         <Filename Value="lazpaintinstance.pas"/>

diff --git a/lazpaint/lazpaintmainform.pas b/lazpaint/lazpaintmainform.pas
@@ -864,7 +864,7 @@   TFMain = class(TForm)
     Zoom: TZoom;
 
     procedure PaintPictureNow;
-    procedure InvalidatePicture;
+    procedure InvalidatePicture(AInvalidateAll: boolean = true);
     function TryOpenFileUTF8(filenameUTF8: string; AddToRecent: Boolean=True;
       ALoadedImage: PImageEntry = nil; ASkipDialogIfSingleImage: boolean = false;
       AAllowDuplicate: boolean = false; AEntryToLoad: integer = -1): Boolean;
@@ -4390,8 +4390,7 @@ procedure TFMain.OnPaintHandler;
 
 procedure TFMain.OnImageChangedHandler(AEvent: TLazPaintImageObservationEvent);
 begin
-  if Assigned(FImageView) then
-    FImageView.InvalidatePicture(False, FLayout.WorkArea, Point(0,0), self);
+  InvalidatePicture(false);
 
   if (image.Width <> FLastWidth) or (image.Height <> FLastHeight)
    or (image.BPP <> FLastBPP) or (image.FrameIndex <> FLastFrameIndex) then
@@ -4412,7 +4411,7 @@ procedure TFMain.OnImageChangedHandler(AEvent: TLazPaintImageObservationEvent);
 
 procedure TFMain.OnImageRenderChanged(Sender: TObject);
 begin
-  InvalidatePicture;
+  InvalidatePicture(false);
 end;
 
 procedure TFMain.UpdateEditPicture(ADelayed: boolean = false);
@@ -4604,10 +4603,10 @@ procedure TFMain.UpdateStatusText;
   Layout.StatusText := s;
 end;
 
-procedure TFMain.InvalidatePicture;
+procedure TFMain.InvalidatePicture(AInvalidateAll: boolean = true);
 begin
   if Assigned(FImageView) and Assigned(FLayout) then
-    FImageView.InvalidatePicture(True, FLayout.WorkArea, Point(0,0), self);
+    FImageView.InvalidatePicture(AInvalidateAll, FLayout.WorkArea, Point(0,0), self);
 end;
 
 function TFMain.GetUseImageBrowser: boolean;

diff --git a/lazpaint/lazpainttype.pas b/lazpaint/lazpainttype.pas
@@ -10,7 +10,7 @@ interface
   {$IFDEF LINUX}, InterfaceBase{$ENDIF};
 
 const
-  LazPaintVersion = 7010000;
+  LazPaintVersion = 7010100;
 
   function LazPaintVersionStr: string;
 

diff --git a/lazpaint/release/debian/linux32/DEBIAN/control b/lazpaint/release/debian/linux32/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: lazpaint
-Version: 7.1
+Version: 7.1.1
 Section: base
 Priority: optional
 Architecture: i386

diff --git a/lazpaint/release/debian/linux64/DEBIAN/control b/lazpaint/release/debian/linux64/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: lazpaint
-Version: 7.1
+Version: 7.1.1
 Section: base
 Priority: optional
 Architecture: amd64

diff --git a/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist b/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist
@@ -19,9 +19,9 @@
     <key>CFBundleSignature</key>
     <string>lazp</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.1</string>
+    <string>7.1.1</string>
     <key>CFBundleVersion</key>
-    <string>7.1</string>
+    <string>7.1.1</string>
     <key>CSResourcesFileMapped</key>
     <true/>
     <key>CFBundleDocumentTypes</key>

diff --git a/lazpaint/release/macOS/makedmg.sh b/lazpaint/release/macOS/makedmg.sh
@@ -12,7 +12,7 @@ fi
 
 
 appname=LazPaint
-appversion=7.1
+appversion=7.1.1
 pkgversion=0
 appnamenospaces=lazpaint
 appbundle="$appname.app"

diff --git a/lazpaint/release/windows/lazpaint.iss b/lazpaint/release/windows/lazpaint.iss
@@ -1,7 +1,7 @@
 #define MyAppName "LazPaint"
 #define MyAppOutputName "lazpaint"
 #define MyInstallerSuffix "_setup_win32_win64"
-#define MyAppVersion "7.1"
+#define MyAppVersion "7.1.1"
 #define MyAppPublisher "Circular, Fabien Wang, Lainz and others"
 #define MyAppURL "http://sourceforge.net/projects/lazpaint/"
 #define MyAppExeName "lazpaint.exe"
@@ -98,7 +98,7 @@ Source: "{#ReleaseDir}lazpaint_x64.exe"; DestDir: "{app}"; DestName: "{#MyAppExe
 Source: "dcraw\dcraw32.exe"; DestDir: "{app}"; DestName: "{#DCRawExeName}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "dcraw\dcraw_x64.exe"; DestDir: "{app}"; DestName: "{#DCRawExeName}"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "libwebp\libwebp32.dll"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "libwebp\libwebp64.exe"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "libwebp\libwebp64.dll"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "{#ReleaseDir}i18n\*.po"; DestDir: "{app}\i18n"; Excludes: "i18n\lazpaint_x64.po"; Flags: ignoreversion
 Source: "{#ReleaseDir}models\*.*"; DestDir: "{app}\models"; Flags: ignoreversion
 Source: "{#ReleaseDir}readme.txt"; DestDir: "{app}"; Flags: ignoreversion