From 145966e50c6c9cd978836b82093ca211a61d345a Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 23 Nov 2021 12:19:20 +1100 Subject: [PATCH] icao processing fixes --- install/install-tk.iss | 8 ++++---- install/install.iss | 8 ++++---- library/fhir/fhir_icao.pas | 2 +- server/endpoint_icao.pas | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/install/install-tk.iss b/install/install-tk.iss index f983e6474..069ce077c 100644 --- 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 index 234226fe2..1a8ecaff1 100644 --- 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 index 6ca19b7cc..a77f2d9e7 100644 --- 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('

Scanning image for QR code ('+inttostr(image.Width)+'x'+inttostr(image.Height)+')

'#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 index 4ed4955cb..9695fba7f 100644 --- 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;