From b7f6c0283e84d2fd1802c3c8cca283b23e07d39c Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Mon, 10 Jun 2013 06:25:08 +0000
Subject: [PATCH] lcl: skip ';' char from extension when generating a
 mime-type, use 'jpeg' instead of 'jpg' as the first extension (issue
 #0024488)

git-svn-id: trunk@41647 -
---
 lcl/include/fpimagebitmap.inc | 12 ++++++------
 lcl/include/jpegimage.inc     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lcl/include/fpimagebitmap.inc b/lcl/include/fpimagebitmap.inc
index 14d0b16918..bedf7b015e 100644
--- a/lcl/include/fpimagebitmap.inc
+++ b/lcl/include/fpimagebitmap.inc
@@ -52,13 +52,13 @@ var
   DefaultFileExt: String;
   i: Integer;
 begin
-  DefaultFileExt:=GetFileExtensions;
-  i:=1;
-  while (i<=length(DefaultFileExt)) and (DefaultFileExt[i]<>';') do
+  DefaultFileExt := GetFileExtensions;
+  i := 1;
+  while (i <= Length(DefaultFileExt)) and (DefaultFileExt[i] <> ';') do
     inc(i);
-  if i<=length(DefaultFileExt) then
-    DefaultFileExt:=copy(DefaultFileExt,1,i);
-  Result:='image/'+DefaultFileExt;
+  if i <= Length(DefaultFileExt) then
+    DefaultFileExt := copy(DefaultFileExt, 1, i - 1);
+  Result := 'image/' + DefaultFileExt;
 end;
 
 procedure TFPImageBitmap.InitializeReader(AImage: TLazIntfImage; AReader: TFPCustomImageReader);
diff --git a/lcl/include/jpegimage.inc b/lcl/include/jpegimage.inc
index bcb5498fab..0e7e7ed1fe 100644
--- a/lcl/include/jpegimage.inc
+++ b/lcl/include/jpegimage.inc
@@ -46,7 +46,7 @@ end;
 
 class function TJPEGImage.GetFileExtensions: string;
 begin
-  Result := 'jpg;jpeg;jpe;jfif';
+  Result := 'jpeg;jpg;jpe;jfif';
 end;
 
 class function TJPEGImage.GetReaderClass: TFPCustomImageReaderClass;