From eb63b9a138bd8707e1b630e7647950f4df1fb20c Mon Sep 17 00:00:00 2001
From: lazarus-bart <lazarus-bart@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 27 Jun 2013 16:49:36 +0000
Subject: [PATCH] LazEdit: lazedit_picslib.pp: uses TFileStreamUtf8 for better
 UTF8 support on Windows.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2756 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/lazedit/lazedit_picslib.pp | 6 +++---
 applications/lazedit/picturedlgform.pp  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/lazedit/lazedit_picslib.pp b/applications/lazedit/lazedit_picslib.pp
index 7cada6e0b..ca87efa24 100644
--- a/applications/lazedit/lazedit_picslib.pp
+++ b/applications/lazedit/lazedit_picslib.pp
@@ -4,7 +4,7 @@ unit LazEdit_PicsLib;
 
 interface
 
-uses SysUtils, Classes, Math;
+uses SysUtils, Classes, Math, LazUtf8Classes;
 
 type
   TImageFormat = (ifUnknown, ifBmp, ifPng, ifGif, ifJpg);
@@ -325,13 +325,13 @@ end;
 
 function GetImageSizeAndFormat(const Fn: String; out Width, Height: dword): TImageFormat;
 var
-  ImgStream: TFileStream;
+  ImgStream: TFileStreamUtf8;
   ImgFormat: TImageFormat;
 begin
   Width := 0;
   Height := 0;
   try
-    ImgStream := TFileStream.Create(Fn,fmOpenRead or fmShareDenyNone);
+    ImgStream := TFileStreamUtf8.Create(Fn,fmOpenRead or fmShareDenyNone);
     try
       ImgStream.Position := 0;
       ImgFormat := GetImageFormatAndDimensions(ImgStream, ExtToImageFormat(ExtractFileExt(Fn)), Width, Height);
diff --git a/applications/lazedit/picturedlgform.pp b/applications/lazedit/picturedlgform.pp
index d8389a31d..f92a6b867 100644
--- a/applications/lazedit/picturedlgform.pp
+++ b/applications/lazedit/picturedlgform.pp
@@ -87,7 +87,7 @@ begin
     FInitialDir := ExtractFileDir(Fn);
     SrcEdit.Text := ExtractFileName(Fn);
     //GetImageSize uses system encoding
-    if GetImageSize(Utf8ToSys(Fn), W, H) then
+    if GetImageSize(Fn, W, H) then
     begin
       WidthEdit.Text := IntToStr(W);
       HeightEdit.Text := IntToStr(H);