now winix is using 'pikotools' (confparser, utf8, mainparser)

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2012-01-12 02:24:08 +00:00
parent cb33f20a24
commit b2d3ca9543
55 changed files with 1749 additions and 1884 deletions

View File

@@ -2,14 +2,14 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010-2011, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
#include <ctime>
#include "image.h"
#include "utf8.h"
#include "utf8/utf8.h"
#include "log.h"
#include "system.h"
#include "plugin.h"
@@ -144,7 +144,7 @@ bool end;
void Image::Add(const std::wstring & in, TextStream<std::string> & out)
{
Ezc::WideToUTF8(in, add_tempa);
PT::WideToUTF8(in, add_tempa);
out << add_tempa;
}
@@ -226,7 +226,7 @@ bool Image::CreateInputFileName()
{
if( system->MakeFilePath(item_work.file, src_path) )
{
Ezc::WideToUTF8(src_path, input_file_name);
PT::WideToUTF8(src_path, input_file_name);
return true;
}
else
@@ -242,7 +242,7 @@ void Image::CreateTmpFileName()
{
stream_tmp_path.Clear();
stream_tmp_path << config->upload_dir << L"/tmp/image_" << std::time(0);
Ezc::WideToUTF8(stream_tmp_path.Str(), tmp_file_name);
PT::WideToUTF8(stream_tmp_path.Str(), tmp_file_name);
}
@@ -387,8 +387,8 @@ void Image::CreateImage()
void Image::CreateThumbnail()
{
Ezc::WideToUTF8(item_work.source, sourcea);
Ezc::WideToUTF8(item_work.dst, dsta);
PT::WideToUTF8(item_work.source, sourcea);
PT::WideToUTF8(item_work.dst, dsta);
MagickWandGenesis();