Skip to content

Commit

Permalink
updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5…
Browse files Browse the repository at this point in the history
…, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings
  • Loading branch information
Vadim Pisarevsky committed Jul 16, 2010
1 parent 0c9eca7 commit f78a3b4
Show file tree
Hide file tree
Showing 465 changed files with 51,756 additions and 41,244 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/flann/util/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class PooledAllocator
template <typename T>
T* allocate(size_t count = 1)
{
T* mem = (T*) this->malloc(sizeof(T)*count);
T* mem = (T*) this->malloc((int)(sizeof(T)*count));
return mem;
}

Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/util/result_set.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ class RadiusResultSet : public ResultSet

int size() const
{
return items.size();
return (int)items.size();
}

bool full() const
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/util/saving.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void save_header(FILE* stream, const NNIndex& index)
IndexHeader load_header(FILE* stream)
{
IndexHeader header;
int read_size = fread(&header,sizeof(header),1,stream);
int read_size = (int)fread(&header,sizeof(header),1,stream);

if (read_size!=1) {
throw FLANNException("Invalid index file, cannot read");
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/flann/util/saving.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void save_value(FILE* stream, const T& value, int count = 1)
template<typename T>
void load_value(FILE* stream, T& value, int count = 1)
{
int read_cnt = fread(&value, sizeof(value),count, stream);
int read_cnt = (int)fread(&value, sizeof(value),count, stream);
if (read_cnt!=count) {
throw FLANNException("Cannot read from file");
}
Expand Down
1,189 changes: 1,033 additions & 156 deletions 3rdparty/include/clapack.h

Large diffs are not rendered by default.

6,270 changes: 2,701 additions & 3,569 deletions 3rdparty/include/png.h

Large diffs are not rendered by default.

Loading

0 comments on commit f78a3b4

Please sign in to comment.