From 1ef0ce2d9257504e9bf52966592aa15126c591ad Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 10 Apr 2016 06:53:20 +0000 Subject: [PATCH] * Implement InternalCheck (By Ondrey Pokorny, Bug ID #29985) git-svn-id: trunk@33465 - --- packages/fcl-image/src/fpreadjpeg.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fcl-image/src/fpreadjpeg.pas b/packages/fcl-image/src/fpreadjpeg.pas index 758f96d0b7..39b840064a 100644 --- a/packages/fcl-image/src/fpreadjpeg.pas +++ b/packages/fcl-image/src/fpreadjpeg.pas @@ -451,11 +451,11 @@ begin end; function TFPReaderJPEG.InternalCheck(Str: TStream): boolean; +var + Buf: array[0..1] of Byte = (0, 0); begin - // ToDo: read header and check - Result:=false; - if Str=nil then exit; - Result:=true; + if Str=nil then exit(false); + Result := (Str.Read(Buf, 2)=2) and (Buf[0]=$FF) and (Buf[1]=$D8); // byte sequence FFD8 = start of image end; constructor TFPReaderJPEG.Create;