icao processing fixes

HealthIntersections · Nov 23, 2021 · 145966e · 145966e
1 parent 594fc4f
commit 145966e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/install/install-tk.iss b/install/install-tk.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRToolkit
 AppName=Health Intersections FHIR Toolkit
-AppVerName=FHIRToolkit v2.0.6
+AppVerName=FHIRToolkit v2.0.7
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-2.0.6
+OutputBaseFilename=fhirtoolkit-win64-2.0.7
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=2.0.6
+AppVersion=2.0.7
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=2.0.6.0
+VersionInfoVersion=2.0.7.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/install/install.iss b/install/install.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRServer
 AppName=Health Intersections FHIR Server
-AppVerName=FHIRServer v2.0.6
+AppVerName=FHIRServer v2.0.7
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-2.0.6
+OutputBaseFilename=fhirserver-win64-2.0.7
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=2.0.6
+AppVersion=2.0.7
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=2.0.6.0
+VersionInfoVersion=2.0.7.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/library/fhir/fhir_icao.pas b/library/fhir/fhir_icao.pas
@@ -394,7 +394,7 @@ function TICAOCardImporter.import(image: TBitmap): THealthcareCard;
   bc : TReadResult;
 begin
   Flog.Append('<p>Scanning image for QR code ('+inttostr(image.Width)+'x'+inttostr(image.Height)+')</p>'#13#10);
-  scanner := TScanManager.create(TBarcodeFormat.Auto, nil);
+  scanner := TScanManager.create(TBarcodeFormat.QR_CODE, nil);
   try
     bc := scanner.Scan(image);
     try

diff --git a/server/endpoint_icao.pas b/server/endpoint_icao.pas
@@ -189,6 +189,7 @@ function TICAOWebServer.readPDF(stream : TStream): TBitmap;
   finally
     FPDFLock.Unlock;
   end;
+  result := nil;
 end;
 
 function TICAOWebServer.render(card : THealthcareCard; title, action, log : String): String;
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,6 +189,7 @@ function TICAOWebServer.readPDF(stream : TStream): TBitmap; @@
       finally
         FPDFLock.Unlock;
       end;
+      result := nil;
     end;
     function TICAOWebServer.render(card : THealthcareCard; title, action, log : String): String;
@@ Expand Down @@