*/
int m_nQuickCompareLimit;
+ int m_nBinaryCompareLimit;
+
/**
* Walk into unique folders and add contents.
* This enables/disables walking into unique folders. If we don't walk into
m_pCtxt->m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
+ m_pCtxt->m_nBinaryCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_BINARY_LIMIT);
m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
m_pCtxt->m_bWalkUniques = GetOptionsMgr()->GetBool(OPT_CMP_WALK_UNIQUE_DIRS);
m_pCtxt->m_bIgnoreReparsePoints = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_REPARSE_POINTS);
{
int nIndex;
int nCompMethod = pCtxt->GetCompareMethod();
+ int nDirs = pCtxt->GetCompareDirs();
unsigned code = DIFFCODE::FILE | DIFFCODE::CMPERR;
+ if ((nCompMethod == CMP_CONTENT || nCompMethod == CMP_QUICK_CONTENT) &&
+ ((di.diffFileInfo[0].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[0].size != DirItem::FILE_SIZE_NONE) ||
+ (di.diffFileInfo[1].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[1].size != DirItem::FILE_SIZE_NONE) ||
+ (nDirs > 2 && di.diffFileInfo[2].size > pCtxt->m_nBinaryCompareLimit && di.diffFileInfo[2].size != DirItem::FILE_SIZE_NONE)))
+ {
+ nCompMethod = CMP_BINARY_CONTENT;
+ }
+
if (nCompMethod == CMP_CONTENT ||
nCompMethod == CMP_QUICK_CONTENT)
{
- int nDirs = pCtxt->GetCompareDirs();
// Reset text stats
for (nIndex = 0; nIndex < nDirs; nIndex++)
CONTROL "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,202,10\r
LTEXT "&Quick compare limit (MB):",IDC_STATIC,7,96,200,10\r
EDITTEXT IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL\r
+ LTEXT "&Binary compare limit (MB):",IDC_STATIC,7,126,200,10\r
+ EDITTEXT IDC_COMPARE_BINARYC_LIMIT,7,138,30,14,ES_AUTOHSCROLL\r
+ LTEXT "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,154,230,30\r
+ EDITTEXT IDC_COMPARE_THREAD_COUNT,7,176,30,14,ES_AUTOHSCROLL\r
PUSHBUTTON "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,198,70,14\r
- LTEXT "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,230,30\r
- EDITTEXT IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL\r
END\r
\r
IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 255, 205\r
extern const String OPT_CMP_MATCH_SIMILAR_LINES OP("Settings/MatchSimilarLines");
extern const String OPT_CMP_STOP_AFTER_FIRST OP("Settings/StopAfterFirst");
extern const String OPT_CMP_QUICK_LIMIT OP("Settings/QuickMethodLimit");
+extern const String OPT_CMP_BINARY_LIMIT OP("Settings/BinaryMethodLimit");
extern const String OPT_CMP_COMPARE_THREADS OP("Settings/CompareThreads");
extern const String OPT_CMP_WALK_UNIQUE_DIRS OP("Settings/ScanUnpairedDir");
extern const String OPT_CMP_IGNORE_REPARSE_POINTS OP("Settings/IgnoreReparsePoints");
pOptions->InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
pOptions->InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
pOptions->InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
+ pOptions->InitOption(OPT_CMP_BINARY_LIMIT, 64 * 1024 * 1024); // 64 Megs
pOptions->InitOption(OPT_CMP_COMPARE_THREADS, -1);
pOptions->InitOption(OPT_CMP_WALK_UNIQUE_DIRS, false);
pOptions->InitOption(OPT_CMP_IGNORE_REPARSE_POINTS, false);
, m_bExpandSubdirs(false)
, m_bIgnoreReparsePoints(false)
, m_nQuickCompareLimit(4 * Mega)
+ , m_nBinaryCompareLimit(64 * Mega)
, m_nCompareThreads(-1)
{
}
DDX_Check(pDX, IDC_EXPAND_SUBDIRS, m_bExpandSubdirs);
DDX_Check(pDX, IDC_IGNORE_REPARSEPOINTS, m_bIgnoreReparsePoints);
DDX_Text(pDX, IDC_COMPARE_QUICKC_LIMIT, m_nQuickCompareLimit);
+ DDX_Text(pDX, IDC_COMPARE_BINARYC_LIMIT, m_nBinaryCompareLimit);
DDX_Text(pDX, IDC_COMPARE_THREAD_COUNT, m_nCompareThreads);
//}}AFX_DATA_MAP
UpdateControls();
m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
m_bIgnoreReparsePoints = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_REPARSE_POINTS);
m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT) / Mega ;
+ m_nBinaryCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_BINARY_LIMIT) / Mega ;
m_nCompareThreads = GetOptionsMgr()->GetInt(OPT_CMP_COMPARE_THREADS);
}
if (m_nQuickCompareLimit > 2000)
m_nQuickCompareLimit = 2000;
GetOptionsMgr()->SaveOption(OPT_CMP_QUICK_LIMIT, m_nQuickCompareLimit * Mega);
+ if (m_nBinaryCompareLimit > 2000)
+ m_nBinaryCompareLimit = 2000;
+ GetOptionsMgr()->SaveOption(OPT_CMP_BINARY_LIMIT, m_nBinaryCompareLimit * Mega);
GetOptionsMgr()->SaveOption(OPT_CMP_COMPARE_THREADS, m_nCompareThreads);
}
m_bExpandSubdirs = GetOptionsMgr()->GetDefault<bool>(OPT_DIRVIEW_EXPAND_SUBDIRS);
m_bIgnoreReparsePoints = GetOptionsMgr()->GetDefault<bool>(OPT_CMP_IGNORE_REPARSE_POINTS);
m_nQuickCompareLimit = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_QUICK_LIMIT) / Mega;
+ m_nBinaryCompareLimit = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_BINARY_LIMIT) / Mega;
m_nCompareThreads = GetOptionsMgr()->GetDefault<unsigned>(OPT_CMP_COMPARE_THREADS);
UpdateData(FALSE);
}
bool m_bExpandSubdirs;
bool m_bIgnoreReparsePoints;
unsigned m_nQuickCompareLimit;
+ unsigned m_nBinaryCompareLimit;
int m_nCompareThreads;
//}}AFX_DATA
#define IDC_UNREGISTER_SHELLEXTENSION 1350\r
#define IDC_MARGIN_COLOR_LABEL 1351\r
#define IDC_MARGIN_BKGD_COLOR 1352\r
+#define IDC_COMPARE_BINARYC_LIMIT 1353\r
#define IDC_EDIT_WHOLE_WORD 8603\r
#define IDC_EDIT_MATCH_CASE 8604\r
#define IDC_EDIT_FINDTEXT 8605\r
msgid "&Quick compare limit (MB):"
msgstr "&Alderaketa azkar muga (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Limite de comparação rápida (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Лимит за бързо сравнение (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "快速比较限制 (MB) (&Q):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "快速比較之檔案大小上限 (MB)(&Q):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Omezení pro rychlé porovnání (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Grænse for hurtig sammenligning (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Limiet snelvergelijking (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-04-19 22:03+0000\n"
+"POT-Creation-Date: 2019-04-21 22:56+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgstr ""
msgid "&Quick compare limit (MB):"
msgstr "Pikavertailun raja (Mt):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Limite de comparaison rapide (MO):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Limit für Schneller Inhalt (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
#: Merge.rc:2E2C5208
msgid "&Quick compare limit (MB):"
-msgstr "クイック コンテンツ制限 (MB)(&Q):"
+msgstr "クイック比較切替閾値 (MB)(&Q):"
+
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr "バイナリ比較切替閾値 (MB)(&B):"
#: Merge.rc:2188DD49
msgid ""
msgid "&Quick compare limit (MB):"
msgstr "빠른 비교 제한 (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Greitojo palyginimo limitas (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgstr "Lygi&nimo srautų skaičius (neigiama reikšmė reiškia turimų procesoriaus branduolių skaičiaus pridėjimą):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Q حد همسنجي سريع (مگابايت)"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Limit sz&ybkiego porównania (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "&Limite da comparação rápida (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Ограничение быстрого сравнения (МБ)"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Omejitev za &hitro primerjavo (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr "Högsta SnabbJämförelseStorlek (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
msgid ""
"&Number of compare threads (a negative value implies addition of the number "
msgid "&Quick compare limit (MB):"
msgstr "&Hızlı Karşılaştırma Sınırı (MB):"
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
msgid "&Quick compare limit (MB):"
msgstr ""
+#: Merge.rc:175DEEF0
+msgid "&Binary compare limit (MB):"
+msgstr ""
+
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"