From 00585ad31ca492a949bca9872a8ad2f341bbb4e8 Mon Sep 17 00:00:00 2001
From: "meffi@lab313.ru" <meffi@lab313.ru@706930b9-3d88-df67-00fe-4c1b76c3f905>
Date: Sun, 27 Apr 2014 23:45:38 +0000
Subject: [PATCH] Free image and project options fixes.

---
 tim2view.lpi |  18 ++++++++----------
 tim2view.lps |  12 ++++++------
 tim2view.res | Bin 16796 -> 16796 bytes
 umain.pas    |   4 +++-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tim2view.lpi b/tim2view.lpi
index 6f0379a..1119521 100644
--- a/tim2view.lpi
+++ b/tim2view.lpi
@@ -23,8 +23,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
-      <RevisionNr Value="75"/>
-      <BuildNr Value="4"/>
+      <RevisionNr Value="78"/>
       <StringTable CompanyName="Lab 313" FileDescription="The best TIMs tool ever!:)" ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="6">
@@ -38,7 +37,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-            <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+            <OtherUnitFiles Value="bgrabitmap"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -82,7 +81,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-            <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+            <OtherUnitFiles Value="bgrabitmap"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -126,7 +125,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-            <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+            <OtherUnitFiles Value="bgrabitmap"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -170,7 +169,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-            <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+            <OtherUnitFiles Value="bgrabitmap"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -214,7 +213,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-            <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+            <OtherUnitFiles Value="bgrabitmap"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -225,7 +224,7 @@
           <CodeGeneration>
             <SmartLinkUnit Value="True"/>
             <TargetCPU Value="i386"/>
-            <TargetOS Value="win32"/>
+            <TargetOS Value="darwin"/>
             <Optimizations>
               <OptimizationLevel Value="3"/>
             </Optimizations>
@@ -351,7 +350,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
-      <OtherUnitFiles Value="lazpaint\bgrabitmap"/>
+      <OtherUnitFiles Value="bgrabitmap"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
@@ -369,7 +368,6 @@
     <Linking>
       <Debugging>
         <DebugInfoType Value="dsDwarf2Set"/>
-        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
       <Options>
diff --git a/tim2view.lps b/tim2view.lps
index 8450797..d1b8b16 100644
--- a/tim2view.lps
+++ b/tim2view.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="9"/>
-    <BuildModes Active="Debug"/>
+    <BuildModes Active="Win Release x86"/>
     <Units Count="15">
       <Unit0>
         <Filename Value="tim2view.lpr"/>
@@ -23,10 +23,11 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="umain"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="890"/>
-        <CursorPos X="50" Y="901"/>
+        <TopLine Value="235"/>
+        <CursorPos X="49" Y="244"/>
         <UsageCount Value="816"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -50,7 +51,6 @@
         <Filename Value="ucommon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ucommon"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
@@ -159,8 +159,8 @@
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="7"/>
-        <CursorPos X="69" Y="16"/>
-        <UsageCount Value="56"/>
+        <CursorPos X="20" Y="16"/>
+        <UsageCount Value="57"/>
         <Loaded Value="True"/>
       </Unit14>
     </Units>
diff --git a/tim2view.res b/tim2view.res
index 46491ec3ea0b2fff35ccf0a6303496e934073b33..05e4cf6d2b3f1ba15e45ad5427a2617b11c17cf7 100644
GIT binary patch
delta 29
lcmbQ!%s8i+al;yBW(Eeo&Fh)t8CfkD^cV~_3$u3G004!}2jKt!

delta 29
lcmbQ!%s8i+al;yBW)=qT&Fh)t8Cgvk^cYMw3$u3G004#H2jc($

diff --git a/umain.pas b/umain.pas
index 17e6863..a362010 100644
--- a/umain.pas
+++ b/umain.pas
@@ -246,6 +246,8 @@ begin
   dlgSavePNG.FileName := FormatPngName(SelectedScanResult.ScanFile, TIM^.dwTimNumber, SelectedTimInfo.BitMode, cbbCLUT.ItemIndex);
   if not dlgSavePNG.Execute then Exit;
 
+  New(Image);
+  Image := nil;
   Tim2Png(TIM, cbbCLUT.ItemIndex, Image, cbbTranspMode.ItemIndex, True);
   SaveImage(dlgSavePNG.FileName, Image, TIMisIndexed(TIM));
   FreeTIM(TIM);
@@ -414,7 +416,7 @@ begin
     Tim2Png(TIM, cbbCLUT.ItemIndex, Image, cbbTranspMode.ItemIndex, False);
 
     Path := Path + FormatPngName(FName, I - 1, BIT_MODE, 0);
-    SaveImage(Path, Image, TIMisIndexed(TIM));
+    SaveImage(Path, Image, False);
     {$IFDEF Linux}FpChmod(Path, &777);{$IFEND}
     Image^.Free;
     Image^ := nil;