diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-27 00:46:17 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2014-07-27 00:46:17 +0100 |
| commit | 99aaeaa069f848a90751dbd112a2fc77c45a81ee (patch) | |
| tree | 3c148ea23933a64e4b7b80859ff0cd8199326ad4 /src/corelib/fpg_imgfmt_png.pas | |
| parent | b01b72f0886583100830cb42e2001d477f22976d (diff) | |
| parent | cc7e8f55c4fc4eb47f910be7d77d101a2012b566 (diff) | |
| download | fpGUI-99aaeaa069f848a90751dbd112a2fc77c45a81ee.tar.xz | |
Merge branch 'release-1.2' into develop
So we can get the latest bug fixes into 'develop'.
Diffstat (limited to 'src/corelib/fpg_imgfmt_png.pas')
| -rw-r--r-- | src/corelib/fpg_imgfmt_png.pas | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/fpg_imgfmt_png.pas b/src/corelib/fpg_imgfmt_png.pas index d9683bbe..3148a5b4 100644 --- a/src/corelib/fpg_imgfmt_png.pas +++ b/src/corelib/fpg_imgfmt_png.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2013 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2014 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -78,7 +78,7 @@ begin try PNGReader := TFPReaderPNG.Create; try - imga.LoadFromFile(AFileName, PNGReader); // auto size image + imga.LoadFromFile(fpgToOSEncoding(AFileName), PNGReader); // auto size image finally PNGReader.Free; end; @@ -165,7 +165,7 @@ begin // Calculated to fit the image within required size: xlocal, ylocal imga := TFPMemoryImage.Create(0, 0); try - imga.LoadFromFile(AFileName, TFPReaderPNG.Create); // auto size image + imga.LoadFromFile(fpgToOSEncoding(AFileName), TFPReaderPNG.Create); // auto size image except imga := nil; imgb := nil; |