Skip to content

Commit

Permalink
matlab/dijkstra.m: moving dijkstra code back into toolbox
Browse files Browse the repository at this point in the history
  • Loading branch information
pdollar committed Jun 20, 2013
1 parent 0d5ef46 commit 71b3205
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion external/history.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Version NEW
-demoGenData.m: major cleanup
-dijkstra.*: fixed for 64 bit and added back to toolbox (thanks Bhuwan Dhingra)

Version 3.10 (11-June-2013)
-NO LONGER SUPPORTING MATLAB VERSIONS PRIOR TO MATLAB 2011b
Expand Down Expand Up @@ -53,7 +54,7 @@ Version 2.62 (22-Dec-11)
-imResample: major optimziations, *input format has changed*
-ploRoc.m: improved options and commenting, fixed second output parameter
-hog: major optimizations, removed obsolete param oGran
-dijskstra.*: removed from toolbox (was broken on 64 bit matlab)
-dijkstra.*: removed from toolbox (was broken on 64 bit matlab)
-removed all 32 bit binaries (will no longer distribute)
-minor: dispMatrixIm.m, imtransform2, bbApply.m, jitterImage.m

Expand Down
4 changes: 3 additions & 1 deletion external/toolboxCompile.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
%
% See also
%
% Piotr's Image&Video Toolbox Version 3.01
% Piotr's Image&Video Toolbox Version NEW
% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu]
% Please email me if you find bugs, or have suggestions or questions!
% Licensed under the Simplified BSD License [see external/bsd.txt]
Expand Down Expand Up @@ -42,6 +42,8 @@
ds=[repmat({'channels'},1,5) 'images' repmat({'classify'},1,2)];
for i=1:length(fs), fs{i}=[rd '/' ds{i} '/private/' fs{i}]; end
for i=1:length(fs), mex([fs{i} '.cpp'],opts{:},[fs{i} '.' mexext]); end
d=[rd '/matlab/private/']; mex([d 'fibheap.cpp'],[d 'dijkstra1.cpp'], ...
opts{:}, [d 'dijkstra1.' mexext]);
catch ME
fprintf(['C++ mex failed, likely due to lack of a C++ compiler.\n' ...
'Run ''mex -setup'' to specify a C++ compiler if available.\n'...
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 71b3205

Please sign in to comment.