Skip to content

Commit

Permalink
*RELEASE 2.3.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ermig1979
ermig1979 committed Jan 9, 2018
1 parent 7d975fb commit 99ebcdb
Show file tree
Hide file tree
Showing 34 changed files with 127 additions and 201 deletions.
2 changes: 0 additions & 2 deletions cmd/CopyData.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ rmdir %OUT_DIR%\data /q /s
echo Copy new data files:
mkdir %OUT_DIR%\data
mkdir %OUT_DIR%\data\resources
mkdir %OUT_DIR%\data\help

xcopy %DATA_DIR%\resources\* %OUT_DIR%\data\resources\* /y /i /s /e
xcopy %DATA_DIR%\help\* %OUT_DIR%\data\help\* /y /i /s
21 changes: 7 additions & 14 deletions docs/data/help/english/developers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@
<h3>Developers</h3>

<p align="justify">
<b>Yermalayeu Ihar</b> is the author of program <b>AntiDupl.NET</b>.
<a href="https://www.linkedin.com/in/ihar-yermalayeu-50a4242a/" target="_top">Yermalayeu Ihar</a> and
<a href="https://github.com/heinrichI" target="_top">Borisov Dmitry</a> are the authors of program <b>AntiDupl.NET</b>.
</p>

<p align="justify">
The source code of this program is available in <a href="http://sourceforge.net/projects/antidupl/?source=directory" target="_top">the public domain</a>.
Therefore the author will be immensely grateful if you will help in development of the program.
The source code of this program is available at <a href="https://github.com/ermig1979/AntiDupl" target="_top">the public domain</a>.
Therefore the authors will be immensely grateful if you will help in development of the program.
</p>

<p align="justify">
The third party projects <a href="http://sourceforge.net/projects/simd/?source=directory" target="_top">Simd</a>
The third party projects <a href="https://github.com/ermig1979/Simd" target="_top">Simd</a>
and <a href="http://www.openjpeg.org/" target="_top">OpenJPEG</a> are used in this project.
</p>

<p align="justify">
The author expresses his personal thanks to:
The authors express thanks to:
</p>

<ul>
Expand Down Expand Up @@ -53,22 +54,14 @@ <h3>Developers</h3>
<li><p align="justify">
Yurii Chornyi for the translation into Ukrainian language for version <b>2.2.11</b>.
</p></li>
<li><p align="justify">
Borisov Dmitry for help with development of version <b>2.3.2</b>.
</p></li>
</ul>

<p align="justify">
Also the author thanks all users who participated in the testing program.
Also the authors thank all users who participated in the testing program.
Your criticisms and suggestions helped me make the best quality product.
Waiting for your further feedback!
Nice use!
</p>

<p align="justify">
Look for updates on the official <a href="http://antidupl.sourceforge.net/english/index.html" target="_top">site</a>
as well as in its <a href="http://antidupl.livejournal.com" target="_top">journal</a> (in Russian).
</p>

</td></tr></table></body>
</html>
5 changes: 4 additions & 1 deletion docs/data/help/english/news.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>Last Updates</h3>
<h3>2.3.9</h3>
<ul>
<li><p align="justify">
Fixed loading text signature of hotkey in menu by using the profile created in the old version.
The program was moved on GitHub.
</p></li>
</ul>

Expand All @@ -19,6 +19,9 @@ <h3>2.3.8</h3>
<li><p align="justify">
Swap the neighboring images in a horizontal look.
</p></li>
<li><p align="justify">
Fixed loading text signature of hotkey in menu by using the profile created in the old version.
</p></li>
</ul>

<h3>2.3.7</h3>
Expand Down
21 changes: 7 additions & 14 deletions docs/data/help/russian/developers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@
<h3>Разработчики</h3>

<p align="justify">
Автором программы <b>AntiDupl.NET</b> является <a href="http://iermolaev.moikrug.ru/" target="_top">Ермолаев Игорь</a>.
Авторами программы <b>AntiDupl.NET</b> являются <a href="https://moikrug.ru/ermig/" target="_top">Ермолаев Игорь</a>
и <a href="https://github.com/heinrichI" target="_top">Борисов Дмитрий</a>.
</p>

<p align="justify">
Исходные коды программы имеются <a href="http://sourceforge.net/projects/antidupl/?source=directory" target="_top">в открытом доступе</a>.
Потому автор будет безмерно благодарен, если вы окажете посильную помощь в ее разработке.
Исходные коды программы имеются <a href="https://github.com/ermig1979/AntiDupl" target="_top">в открытом доступе</a>.
Потому авторы будут безмерно благодарны, если вы окажете посильную помощь в ее разработке.
</p>

<p align="justify">
В проекте использованы сторонние библиотеки <a href="http://sourceforge.net/projects/simd/?source=directory" target="_top">Simd</a>
В проекте использованы сторонние библиотеки <a href="https://github.com/ermig1979/Simd" target="_top">Simd</a>
и <a href="http://www.openjpeg.org/" target="_top">OpenJPEG</a>.
</p>

<p align="justify">
Автор выражает персональную благодарность:
Авторы выражают благодарность:
</p>

<ul>
Expand Down Expand Up @@ -53,21 +54,13 @@ <h3>Разработчики</h3>
<li><p align="justify">
Юрию Черному за перевод на украинский язык для версии <b>2.2.11</b>.
</p></li>
<li><p align="justify">
Борисову Дмитрию за помошь в разработке версии <b>2.3.2</b>.
</p></li>
</ul>

<p align="justify">
Также автор выражает благодарность всем пользователям, кто принял участие в тестировании программы.
Также авторы выражают благодарность всем пользователям, кто принял участие в тестировании программы.
Ваши критические замечания и предложения помогли мне сделать максимально качественный продукт.
Жду ваших дальнейших откликов! Приятного использования!
</p>

<p align="justify">
Следите за обновлениями на официальном <a href="http://antidupl.sourceforge.net/russian/index.html" target="_top">сайте</a> программы,
а также в ее <a href="http://antidupl.livejournal.com" target="_top">журнале</a>.
</p>

</td></tr></table></body>
</html>
5 changes: 4 additions & 1 deletion docs/data/help/russian/news.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>Последние обновления</h3>
<h3>2.3.9</h3>
<ul>
<li><p align="justify">
Исправлена загрузка подписи горячей клавиши в меню при использовании профиля созданного в старой версии.
Программа переехала на GitHub.
</p></li>
</ul>

Expand All @@ -19,6 +19,9 @@ <h3>2.3.8</h3>
<li><p align="justify">
Поменяны местами изображения соседних картинок в горизонтальном виде.
</p></li>
<li><p align="justify">
Исправлена загрузка подписи горячей клавиши в меню при использовании профиля созданного в старой версии.
</p></li>
</ul>

<h3>2.3.7</h3>
Expand Down
21 changes: 10 additions & 11 deletions docs/english/download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,31 @@ <h2>Download</h2>

<table width=1012 border="1" style='border-collapse:collapse'>
<tr> <th>Release date</th> <th>Binary version</th> <th>Size</th> <th>Support of additional languages</th> <th>Source code</th> <th>Size</th></tr>

<tr> <td align="center">18.09.2015</td>
<tr> <td align="center">01/09/2018</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.9.exe/download" target="_parent">AntiDupl.NET-2.3.9.exe</a></td> <td align="center">1.4 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.9.zip/download" target="_parent">AntiDupl.NET-2.3.9.zip</a></td> <td align="center">5.1 Mb</td></tr>
<tr> <td align="center">09/18/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.8.exe/download" target="_parent">AntiDupl.NET-2.3.8.exe</a></td> <td align="center">3.1 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.8.zip/download" target="_parent">AntiDupl.NET-2.3.8.zip</a></td> <td align="center">3.6 Mb</td></tr>

<tr> <td align="center">09.09.2015</td>
<tr> <td align="center">09/09/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.7.exe/download" target="_parent">AntiDupl.NET-2.3.7.exe</a></td> <td align="center">3.1 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.7.zip/download" target="_parent">AntiDupl.NET-2.3.7.zip</a></td> <td align="center">3.6 Mb</td></tr>

<tr> <td align="center">02.04.2015</td>
<tr> <td align="center">04/02/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.6.exe/download" target="_parent">AntiDupl.NET-2.3.6.exe</a></td> <td align="center">2.8 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.6.zip/download" target="_parent">AntiDupl.NET-2.3.6.zip</a></td> <td align="center">3.4 Mb</td></tr>

<tr> <td align="center">04.03.2015</td>
<tr> <td align="center">03/04/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.5.exe/download" target="_parent">AntiDupl.NET-2.3.5.exe</a></td> <td align="center">2.8 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.5.zip/download" target="_parent">AntiDupl.NET-2.3.5.zip</a></td> <td align="center">3.1 Mb</td></tr>

<tr> <td align="center">25.02.2015</td>
<tr> <td align="center">02/25/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.4.exe/download" target="_parent">AntiDupl.NET-2.3.4.exe</a></td> <td align="center">3.0 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.4.zip/download" target="_parent">AntiDupl.NET-2.3.4.zip</a></td> <td align="center">3.2 Mb</td></tr>
<tr> <td align="center">04.02.2015</td>
<tr> <td align="center">02/04/2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.3.exe/download" target="_parent">AntiDupl.NET-2.3.3.exe</a></td> <td align="center">2.2 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.3.zip/download" target="_parent">AntiDupl.NET-2.3.3.zip</a></td> <td align="center">3.3 Mb</td></tr>
Expand Down
7 changes: 3 additions & 4 deletions docs/english/head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ <h1>AntiDupl is a program of similar pictures search</h1>

<a href="index.html?page=news.html" target="_top">News</a> |
<a href="index.html?page=download.html" target="_top">Download</a> |
<a href="https://github.com/ermig1979/AntiDupl/issues/" target="_top">Discuss</a> |
<a href="../data/help/english/index.html" target="_top">AntiDupl.NET Description</a> |
<a href="mailto:[email protected]">Send A Letter</a> |
<a href="http://sourceforge.net/p/antidupl/discussion/english/" target="_top">Discuss At Forum</a> |
<a href="index.html?page=thanks.html" target="_top">Thank The Author</a> |
<a href="http://sourceforge.net/projects/antidupl/?source=directory" target="_top">For Developers</a>
<a href="../data/help/english/index.html?page=developers.html" target="_top">Authors</a> |
<a href="https://github.com/ermig1979/AntiDupl" target="_top">GitHub</a>
</center>

</td></tr></table></center></body>
Expand Down
3 changes: 3 additions & 0 deletions docs/english/news.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

<h2>News</h2>

<p align=justify>
<b>09.01.2018</b> - The program <a href="index.html?page=download.html" target="_top">AntiDupl.NET-2.3.9</a> was moved to GitHub.
</p>
<p align=justify>
<b>18.09.2015</b> - A new version of <a href="index.html?page=download.html" target="_top">AntiDupl.NET-2.3.8</a>.
The following changes were happened in it:
Expand Down
36 changes: 0 additions & 36 deletions docs/english/thanks.html
View file

This file was deleted.

4 changes: 4 additions & 0 deletions docs/russian/download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ <h2>Скачать</h2>
<table width=1012 border="1" style='border-collapse:collapse'>
<tr> <th>Дата выхода</th> <th>Бинарная версия</th> <th>Размер</th> <th>Поддержка дополнительных языков</th> <th>Исходные коды</th> <th>Размер</th></tr>

<tr> <td align="center">18.09.2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.8.exe/download" target="_parent">AntiDupl.NET-2.3.8.exe</a></td> <td align="center">3.1 Mb</td>
<td align="center"></td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/src/AntiDupl.NET-2.3.8.zip/download" target="_parent">AntiDupl.NET-2.3.8.zip</a></td> <td align="center">3.6 Mb</td></tr>
<tr> <td align="center">18.09.2015</td>
<td align="center"><a href="http://sourceforge.net/projects/antidupl/files/bin/AntiDupl.NET-2.3.8.exe/download" target="_parent">AntiDupl.NET-2.3.8.exe</a></td> <td align="center">3.1 Мб</td>
<td align="center"></td>
Expand Down
9 changes: 3 additions & 6 deletions docs/russian/head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@ <h1>AntiDupl - программа поиска похожих изображен

<a href="index.html?page=news.html" target="_top">Новости</a> |
<a href="index.html?page=download.html" target="_top">Скачать</a> |
<a href="https://github.com/ermig1979/AntiDupl/issues" target="_top">Обсудить</a> |
<a href="index.html?page=manual.html" target="_top"> Описание AntiDupl-1.17</a> |
<a href="index.html?page=manual2.html" target="_top"> Описание AntiDupl-2.4.2</a> |
<a href="../data/help/russian/index.html" target="_top"> Описание AntiDupl.NET</a> |
<a href="mailto:[email protected]">Написать</a> |
<a href="http://sourceforge.net/p/antidupl/discussion/russian/" target="_top">Обсудить на форуме</a> |
<a href="http://antidupl.livejournal.com/" target="_top">Журнал</a> |
<a href="http://iermolaev.moikrug.ru/" target="_top">Об авторе</a> |
<a href="index.html?page=thanks.html" target="_top">Поблагодарить</a> |
<a href="http://sourceforge.net/projects/antidupl/?source=directory" target="_top">Разработчикам</a>
<a href="../data/help/russian/index.html?page=developers.html" target="_top">Авторы</a> |
<a href="https://github.com/ermig1979/AntiDupl" target="_top">GitHub</a>
</center>

</td></tr></table></center></body>
Expand Down
4 changes: 4 additions & 0 deletions docs/russian/news.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

<h2>Новости</h2>

<p align=justify>
<b>09.01.2018</b> - Программа <a href="index.html?page=download.html" target="_top">AntiDupl.NET-2.3.9</a> переехала на GitHub.
</p>

<p align=justify>
<b>18.09.2015</b> - Доступна новая версия <a href="index.html?page=download.html" target="_top">AntiDupl.NET-2.3.8</a>.
В ней произошли следующие изменения:
Expand Down
37 changes: 0 additions & 37 deletions docs/russian/thanks.html
View file

This file was deleted.

2 changes: 1 addition & 1 deletion docs/version.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<Version xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<major>2</major>
<minor>3</minor>
<release>8</release>
<release>9</release>
</Version>
4 changes: 2 additions & 2 deletions src/AntiDupl/AntiDupl.NET/CoreDll.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,9 @@ public struct adPathWithSubFolderW
public adVersionGet_fn adVersionGet = null;

[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
public delegate IntPtr adCreate_fn();
public delegate IntPtr adCreate_fn(string userPath);
[DynamicModuleApi]
public adCreate_fn adCreate = null;
public adCreate_fn adCreateW = null;

[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
public delegate Error adRelease_fn(IntPtr handle);
Expand Down
4 changes: 2 additions & 2 deletions src/AntiDupl/AntiDupl.NET/CoreLib.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class CoreLib : IDisposable

//-----------Public functions----------------------------------------------

public CoreLib()
public CoreLib(string userPath)
{
try
{
Expand All @@ -51,7 +51,7 @@ public CoreLib()
}
if (Version.Compatible(GetVersion(CoreDll.VersionType.AntiDupl)))
{
m_handle = m_dll.adCreate();
m_handle = m_dll.adCreateW(userPath);
}
else
throw new Exception("Incompatible core library version!");
Expand Down
2 changes: 1 addition & 1 deletion src/AntiDupl/AntiDupl.NET/Form/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class MainForm : Form

public MainForm()
{
m_core = new CoreLib();
m_core = new CoreLib(Resources.UserPath);
m_options = Options.Load();
if (m_options.loadProfileOnLoading)
m_coreOptions = CoreOptions.Load(m_options.coreOptionsFileName, m_core, m_options.onePath);
Expand Down
Loading

0 comments on commit 99ebcdb

Please sign in to comment.