mirror of
https://github.com/moparisthebest/Simba
synced 2024-11-28 20:12:16 -05:00
Changes + Fixes for OCRBench, I forgot to remove -WG.
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@320 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
parent
75aca7ff2b
commit
be478d0ba1
@ -36,7 +36,7 @@
|
|||||||
<Filename Value="project1.lpr"/>
|
<Filename Value="project1.lpr"/>
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
<UnitName Value="project1"/>
|
<UnitName Value="project1"/>
|
||||||
<UsageCount Value="49"/>
|
<UsageCount Value="50"/>
|
||||||
</Unit0>
|
</Unit0>
|
||||||
<Unit1>
|
<Unit1>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
@ -44,10 +44,10 @@
|
|||||||
<ComponentName Value="Form1"/>
|
<ComponentName Value="Form1"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="Unit1"/>
|
<UnitName Value="Unit1"/>
|
||||||
<CursorPos X="3" Y="94"/>
|
<CursorPos X="33" Y="112"/>
|
||||||
<TopLine Value="73"/>
|
<TopLine Value="85"/>
|
||||||
<EditorIndex Value="0"/>
|
<EditorIndex Value="0"/>
|
||||||
<UsageCount Value="49"/>
|
<UsageCount Value="50"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit1>
|
</Unit1>
|
||||||
<Unit2>
|
<Unit2>
|
||||||
@ -76,16 +76,16 @@
|
|||||||
<CursorPos X="25" Y="50"/>
|
<CursorPos X="25" Y="50"/>
|
||||||
<TopLine Value="31"/>
|
<TopLine Value="31"/>
|
||||||
<EditorIndex Value="2"/>
|
<EditorIndex Value="2"/>
|
||||||
<UsageCount Value="25"/>
|
<UsageCount Value="26"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit4>
|
</Unit4>
|
||||||
<Unit5>
|
<Unit5>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<UnitName Value="ocr"/>
|
<UnitName Value="ocr"/>
|
||||||
<CursorPos X="18" Y="467"/>
|
<CursorPos X="78" Y="451"/>
|
||||||
<TopLine Value="448"/>
|
<TopLine Value="423"/>
|
||||||
<EditorIndex Value="4"/>
|
<EditorIndex Value="4"/>
|
||||||
<UsageCount Value="25"/>
|
<UsageCount Value="26"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit5>
|
</Unit5>
|
||||||
<Unit6>
|
<Unit6>
|
||||||
@ -94,7 +94,7 @@
|
|||||||
<CursorPos X="18" Y="81"/>
|
<CursorPos X="18" Y="81"/>
|
||||||
<TopLine Value="47"/>
|
<TopLine Value="47"/>
|
||||||
<EditorIndex Value="8"/>
|
<EditorIndex Value="8"/>
|
||||||
<UsageCount Value="24"/>
|
<UsageCount Value="25"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit6>
|
</Unit6>
|
||||||
<Unit7>
|
<Unit7>
|
||||||
@ -103,7 +103,7 @@
|
|||||||
<CursorPos X="54" Y="198"/>
|
<CursorPos X="54" Y="198"/>
|
||||||
<TopLine Value="115"/>
|
<TopLine Value="115"/>
|
||||||
<EditorIndex Value="1"/>
|
<EditorIndex Value="1"/>
|
||||||
<UsageCount Value="24"/>
|
<UsageCount Value="25"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit7>
|
</Unit7>
|
||||||
<Unit8>
|
<Unit8>
|
||||||
@ -118,7 +118,7 @@
|
|||||||
<CursorPos X="5" Y="557"/>
|
<CursorPos X="5" Y="557"/>
|
||||||
<TopLine Value="535"/>
|
<TopLine Value="535"/>
|
||||||
<EditorIndex Value="7"/>
|
<EditorIndex Value="7"/>
|
||||||
<UsageCount Value="22"/>
|
<UsageCount Value="23"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit9>
|
</Unit9>
|
||||||
<Unit10>
|
<Unit10>
|
||||||
@ -127,7 +127,7 @@
|
|||||||
<CursorPos X="23" Y="23"/>
|
<CursorPos X="23" Y="23"/>
|
||||||
<TopLine Value="1"/>
|
<TopLine Value="1"/>
|
||||||
<EditorIndex Value="6"/>
|
<EditorIndex Value="6"/>
|
||||||
<UsageCount Value="21"/>
|
<UsageCount Value="22"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit10>
|
</Unit10>
|
||||||
<Unit11>
|
<Unit11>
|
||||||
@ -136,7 +136,7 @@
|
|||||||
<CursorPos X="78" Y="455"/>
|
<CursorPos X="78" Y="455"/>
|
||||||
<TopLine Value="432"/>
|
<TopLine Value="432"/>
|
||||||
<EditorIndex Value="3"/>
|
<EditorIndex Value="3"/>
|
||||||
<UsageCount Value="18"/>
|
<UsageCount Value="19"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit11>
|
</Unit11>
|
||||||
<Unit12>
|
<Unit12>
|
||||||
@ -157,131 +157,127 @@
|
|||||||
<CursorPos X="7" Y="103"/>
|
<CursorPos X="7" Y="103"/>
|
||||||
<TopLine Value="73"/>
|
<TopLine Value="73"/>
|
||||||
<EditorIndex Value="5"/>
|
<EditorIndex Value="5"/>
|
||||||
<UsageCount Value="15"/>
|
<UsageCount Value="16"/>
|
||||||
<Loaded Value="True"/>
|
<Loaded Value="True"/>
|
||||||
</Unit14>
|
</Unit14>
|
||||||
</Units>
|
</Units>
|
||||||
<JumpHistory Count="30" HistoryIndex="29">
|
<JumpHistory Count="29" HistoryIndex="28">
|
||||||
<Position1>
|
<Position1>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="571" Column="25" TopLine="551"/>
|
<Caret Line="588" Column="7" TopLine="575"/>
|
||||||
</Position1>
|
</Position1>
|
||||||
<Position2>
|
<Position2>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="581" Column="4" TopLine="550"/>
|
<Caret Line="585" Column="7" TopLine="563"/>
|
||||||
</Position2>
|
</Position2>
|
||||||
<Position3>
|
<Position3>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/finder.pas"/>
|
||||||
<Caret Line="575" Column="3" TopLine="555"/>
|
<Caret Line="64" Column="27" TopLine="49"/>
|
||||||
</Position3>
|
</Position3>
|
||||||
<Position4>
|
<Position4>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/finder.pas"/>
|
||||||
<Caret Line="458" Column="25" TopLine="425"/>
|
<Caret Line="65" Column="27" TopLine="49"/>
|
||||||
</Position4>
|
</Position4>
|
||||||
<Position5>
|
<Position5>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="459" Column="121" TopLine="440"/>
|
<Caret Line="583" Column="67" TopLine="551"/>
|
||||||
</Position5>
|
</Position5>
|
||||||
<Position6>
|
<Position6>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="588" Column="39" TopLine="560"/>
|
<Caret Line="597" Column="18" TopLine="576"/>
|
||||||
</Position6>
|
</Position6>
|
||||||
<Position7>
|
<Position7>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="593" Column="5" TopLine="563"/>
|
<Caret Line="601" Column="7" TopLine="576"/>
|
||||||
</Position7>
|
</Position7>
|
||||||
<Position8>
|
<Position8>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="588" Column="7" TopLine="575"/>
|
<Caret Line="581" Column="39" TopLine="564"/>
|
||||||
</Position8>
|
</Position8>
|
||||||
<Position9>
|
<Position9>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="585" Column="7" TopLine="563"/>
|
<Caret Line="594" Column="7" TopLine="574"/>
|
||||||
</Position9>
|
</Position9>
|
||||||
<Position10>
|
<Position10>
|
||||||
<Filename Value="../../Units/MMLCore/finder.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="64" Column="27" TopLine="49"/>
|
<Caret Line="622" Column="79" TopLine="588"/>
|
||||||
</Position10>
|
</Position10>
|
||||||
<Position11>
|
<Position11>
|
||||||
<Filename Value="../../Units/MMLCore/finder.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="65" Column="27" TopLine="49"/>
|
<Caret Line="54" Column="20" TopLine="1"/>
|
||||||
</Position11>
|
</Position11>
|
||||||
<Position12>
|
<Position12>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="583" Column="67" TopLine="551"/>
|
<Caret Line="53" Column="20" TopLine="15"/>
|
||||||
</Position12>
|
</Position12>
|
||||||
<Position13>
|
<Position13>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="597" Column="18" TopLine="576"/>
|
<Caret Line="45" Column="65" TopLine="39"/>
|
||||||
</Position13>
|
</Position13>
|
||||||
<Position14>
|
<Position14>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="601" Column="7" TopLine="576"/>
|
<Caret Line="119" Column="5" TopLine="93"/>
|
||||||
</Position14>
|
</Position14>
|
||||||
<Position15>
|
<Position15>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="581" Column="39" TopLine="564"/>
|
<Caret Line="30" Column="68" TopLine="6"/>
|
||||||
</Position15>
|
</Position15>
|
||||||
<Position16>
|
<Position16>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="594" Column="7" TopLine="574"/>
|
<Caret Line="105" Column="3" TopLine="73"/>
|
||||||
</Position16>
|
</Position16>
|
||||||
<Position17>
|
<Position17>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="622" Column="79" TopLine="588"/>
|
<Caret Line="12" Column="77" TopLine="1"/>
|
||||||
</Position17>
|
</Position17>
|
||||||
<Position18>
|
<Position18>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="54" Column="20" TopLine="1"/>
|
<Caret Line="37" Column="77" TopLine="26"/>
|
||||||
</Position18>
|
</Position18>
|
||||||
<Position19>
|
<Position19>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="53" Column="20" TopLine="15"/>
|
<Caret Line="619" Column="28" TopLine="592"/>
|
||||||
</Position19>
|
</Position19>
|
||||||
<Position20>
|
<Position20>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="45" Column="65" TopLine="39"/>
|
<Caret Line="527" Column="41" TopLine="496"/>
|
||||||
</Position20>
|
</Position20>
|
||||||
<Position21>
|
<Position21>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLCore/ocrutil.pas"/>
|
||||||
<Caret Line="119" Column="5" TopLine="93"/>
|
<Caret Line="57" Column="21" TopLine="37"/>
|
||||||
</Position21>
|
</Position21>
|
||||||
<Position22>
|
<Position22>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="30" Column="68" TopLine="6"/>
|
<Caret Line="467" Column="18" TopLine="448"/>
|
||||||
</Position22>
|
</Position22>
|
||||||
<Position23>
|
<Position23>
|
||||||
<Filename Value="unit1.pas"/>
|
<Filename Value="../../Units/MMLAddon/tpa.pas"/>
|
||||||
<Caret Line="105" Column="3" TopLine="73"/>
|
<Caret Line="50" Column="33" TopLine="30"/>
|
||||||
</Position23>
|
</Position23>
|
||||||
<Position24>
|
<Position24>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="unit1.pas"/>
|
||||||
<Caret Line="12" Column="77" TopLine="1"/>
|
<Caret Line="111" Column="35" TopLine="97"/>
|
||||||
</Position24>
|
</Position24>
|
||||||
<Position25>
|
<Position25>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="37" Column="77" TopLine="26"/>
|
<Caret Line="384" Column="34" TopLine="445"/>
|
||||||
</Position25>
|
</Position25>
|
||||||
<Position26>
|
<Position26>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="619" Column="28" TopLine="592"/>
|
<Caret Line="468" Column="38" TopLine="445"/>
|
||||||
</Position26>
|
</Position26>
|
||||||
<Position27>
|
<Position27>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="527" Column="41" TopLine="496"/>
|
<Caret Line="469" Column="26" TopLine="445"/>
|
||||||
</Position27>
|
</Position27>
|
||||||
<Position28>
|
<Position28>
|
||||||
<Filename Value="../../Units/MMLCore/ocrutil.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="57" Column="21" TopLine="37"/>
|
<Caret Line="486" Column="18" TopLine="467"/>
|
||||||
</Position28>
|
</Position28>
|
||||||
<Position29>
|
<Position29>
|
||||||
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
<Filename Value="../../Units/MMLCore/ocr.pas"/>
|
||||||
<Caret Line="467" Column="18" TopLine="448"/>
|
<Caret Line="634" Column="41" TopLine="293"/>
|
||||||
</Position29>
|
</Position29>
|
||||||
<Position30>
|
|
||||||
<Filename Value="../../Units/MMLAddon/tpa.pas"/>
|
|
||||||
<Caret Line="50" Column="33" TopLine="30"/>
|
|
||||||
</Position30>
|
|
||||||
</JumpHistory>
|
</JumpHistory>
|
||||||
</ProjectOptions>
|
</ProjectOptions>
|
||||||
<CompilerOptions>
|
<CompilerOptions>
|
||||||
@ -303,11 +299,6 @@
|
|||||||
<Debugging>
|
<Debugging>
|
||||||
<GenerateDebugInfo Value="True"/>
|
<GenerateDebugInfo Value="True"/>
|
||||||
</Debugging>
|
</Debugging>
|
||||||
<Options>
|
|
||||||
<Win32>
|
|
||||||
<GraphicApplication Value="True"/>
|
|
||||||
</Win32>
|
|
||||||
</Options>
|
|
||||||
</Linking>
|
</Linking>
|
||||||
<Other>
|
<Other>
|
||||||
<CustomOptions Value="-dOCRDEBUG
|
<CustomOptions Value="-dOCRDEBUG
|
||||||
|
@ -6,7 +6,7 @@ interface
|
|||||||
|
|
||||||
uses
|
uses
|
||||||
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
|
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
|
||||||
StdCtrls, ExtCtrls, Client, MufasaTypes, Bitmaps;
|
StdCtrls, ExtCtrls, Client, MufasaTypes, Bitmaps, ocr;
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
||||||
@ -108,7 +108,7 @@ begin
|
|||||||
Form1.Image1.Canvas.TextOut(0, 0, s);
|
Form1.Image1.Canvas.TextOut(0, 0, s);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
{$IFDEF OCRDEBUG}
|
{$IFDEF OCRDEBUG}
|
||||||
Form1.Image1.Picture.SaveToFile('/tmp/ocrbench.bmp');
|
Form1.Image1.Picture.SaveToFile(OCRDebugPath + 'ocrbench.bmp');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
bmp.Free;
|
bmp.Free;
|
||||||
|
@ -64,7 +64,13 @@ uses
|
|||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
{$IFDEF OCRDEBUG}
|
||||||
|
{$IFDEF LINUX}
|
||||||
|
const OCRDebugPath = '/tmp/';
|
||||||
|
{$ELSE}
|
||||||
|
const OCRDebugPath = '';
|
||||||
|
{$ENDIF}
|
||||||
|
{$ENDIF}
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
uses
|
||||||
@ -365,7 +371,7 @@ begin
|
|||||||
// Filter 1
|
// Filter 1
|
||||||
FilterUpTextByColour(bmp,w,h);
|
FilterUpTextByColour(bmp,w,h);
|
||||||
{$IFDEF OCRSAVEBITMAP}
|
{$IFDEF OCRSAVEBITMAP}
|
||||||
bmp.SaveToFile('/tmp/ocrcol.bmp');
|
bmp.SaveToFile(OCRDebugPath + 'ocrcol.bmp');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
{$IFDEF OCRDEBUG}
|
{$IFDEF OCRDEBUG}
|
||||||
@ -375,7 +381,7 @@ begin
|
|||||||
FilterUpTextByCharacteristics(bmp,w,h);
|
FilterUpTextByCharacteristics(bmp,w,h);
|
||||||
|
|
||||||
{$IFDEF OCRSAVEBITMAP}
|
{$IFDEF OCRSAVEBITMAP}
|
||||||
bmp.SaveToFile('/tmp/ocrdebug.bmp');
|
bmp.SaveToFile(OCRDebugPath + 'ocrdebug.bmp');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
{$IFDEF OCRDEBUG}
|
{$IFDEF OCRDEBUG}
|
||||||
DebugToBmp(bmp,2,h);
|
DebugToBmp(bmp,2,h);
|
||||||
|
Loading…
Reference in New Issue
Block a user