Amebis/cld2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address CLD2 issue 24: Problems compiling on Windows.

Browse Source 
https://code.google.com/p/cld2/issues/detail?id=24


git-svn-id: https://cld2.googlecode.com/svn/trunk@169 b252ecd4-b096-bf77-eb8e-91563289f87e
This commit is contained in:
andrewhayden@google.com
2014-10-01 15:06:16 +00:00
parent c9f9d40322
commit 6e94c9e178
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/cld2_dynamic_data.cc
View File

@@ -30,7 +30,8 @@ bool mem_compare(const void* data1, const void* data2, const int length) {
if (raw1[x] != raw2[x]) { if (raw1[x] != raw2[x]) {
fprintf(stderr, "mem difference at data[%d]: decimal %d != decimal %d\n", fprintf(stderr, "mem difference at data[%d]: decimal %d != decimal %d\n",
x, (unsigned int) raw1[x], (unsigned int) raw2[x]); x, (unsigned int) raw1[x], (unsigned int) raw2[x]);
for (int y=std::max(0,x-5); y<length && y<=x+5; y++) { int y = (x - 5 > 0) ? (x - 5) : 0; // https://code.google.com/p/cld2/issues/detail?id=24
for (; y<length && y<=x+5; y++) {
fprintf(stderr, "[%d]: %d <-> %d%s\n", fprintf(stderr, "[%d]: %d <-> %d%s\n",
y, (unsigned int) raw1[y], (unsigned int) raw2[y], y, (unsigned int) raw1[y], (unsigned int) raw2[y],
( x == y ? " [FIRST ERROR DETECTED HERE] " : "")); ( x == y ? " [FIRST ERROR DETECTED HERE] " : ""));
@@ -82,7 +83,7 @@ void dumpHeader(FileHeader* header) {
tableNames[5]="deltaocta_obj"; tableNames[5]="deltaocta_obj";
tableNames[6]="distinctocta_obj"; tableNames[6]="distinctocta_obj";
for (int x=0; x<header->numTablesEncoded; x++) { for (int x=0; x < (int) header->numTablesEncoded; x++) {
TableHeader& tHeader = header->tableHeaders[x]; TableHeader& tHeader = header->tableHeaders[x];
fprintf(stdout, "Table %d: (%s)\n", (x+1), tableNames[x]);; fprintf(stdout, "Table %d: (%s)\n", (x+1), tableNames[x]);;

4
internal/cld2_dynamic_data_loader.cc
View File

@@ -96,7 +96,7 @@ CLD2DynamicData::FileHeader* loadInternal(FILE* inFile, const void* basePointer,
CLD2DynamicData::TableHeader* tableHeaders = new CLD2DynamicData::TableHeader[header->numTablesEncoded]; CLD2DynamicData::TableHeader* tableHeaders = new CLD2DynamicData::TableHeader[header->numTablesEncoded];
header->tableHeaders = tableHeaders; header->tableHeaders = tableHeaders;
for (int x=0; x<header->numTablesEncoded; x++) { for (int x=0; x < (int) header->numTablesEncoded; x++) {
CLD2DynamicData::TableHeader *header = &(tableHeaders[x]); CLD2DynamicData::TableHeader *header = &(tableHeaders[x]);
CLD2_READINT(kCLDTableSizeOne); CLD2_READINT(kCLDTableSizeOne);
CLD2_READINT(kCLDTableSize); CLD2_READINT(kCLDTableSize);
@@ -232,7 +232,7 @@ CLD2::ScoringTables* loadDataInternal(CLD2DynamicData::FileHeader* header, const
// 3. Each table // 3. Each table
CLD2::CLD2TableSummary* tableSummaries = new CLD2::CLD2TableSummary[header->numTablesEncoded]; CLD2::CLD2TableSummary* tableSummaries = new CLD2::CLD2TableSummary[header->numTablesEncoded];
for (int x=0; x<header->numTablesEncoded; x++) { for (int x=0; x < (int) header->numTablesEncoded; x++) {
CLD2::CLD2TableSummary &summary = tableSummaries[x]; CLD2::CLD2TableSummary &summary = tableSummaries[x];
CLD2DynamicData::TableHeader& tHeader = header->tableHeaders[x]; CLD2DynamicData::TableHeader& tHeader = header->tableHeaders[x];
const CLD2::IndirectProbBucket4* kCLDTable = const CLD2::IndirectProbBucket4* kCLDTable =