quantal-changes.diff
| ICLQt/src/GUI.cpp (working copy) | ||
|---|---|---|
| 124 | 124 | |
| 125 | 125 |
#include <map> |
| 126 | 126 |
#include <set> |
| 127 |
#include <unistd.h> |
|
| 127 | 128 | |
| 128 | 129 |
using namespace std; |
| 129 | 130 |
using namespace icl::utils; |
| include/ICLCV/FloodFiller.h (working copy) | ||
|---|---|---|
| 215 | 215 |
refcol[2] = refb; |
| 216 | 216 |
} |
| 217 | 217 |
inline bool operator()( const T &r, const T &g, const T &b) const{
|
| 218 |
return sqr(r-refcol[0]) + sqr(g-refcol[1]) + sqr(b-refcol[2]) < maxSquaredEuklDist;
|
|
| 218 |
return utils::sqr(r-refcol[0]) + utils::sqr(g-refcol[1]) + utils::sqr(b-refcol[2]) < maxSquaredEuklDist;
|
|
| 219 | 219 |
} |
| 220 | 220 |
}; |
| 221 | 221 |
}; |
| ICLCV/src/HungarianAlgorithm.cpp (working copy) | ||
|---|---|---|
| 426 | 426 |
} |
| 427 | 427 |
|
| 428 | 428 |
// }}} |
| 429 | ||
| 430 |
template<class real> |
|
| 431 |
real findSmallest(Array2D<real> &cost, vec &rowCover, vec &colCover, real maxCost){
|
|
| 432 |
// {{{ open
|
|
| 433 |
|
|
| 434 |
real minval = maxCost; //There cannot be a larger cost than this. |
|
| 435 |
for (int i=0; i<cost.getWidth(); i++){ //Now find the smallest uncovered value.
|
|
| 436 |
for (int j=0; j<cost.getHeight(); j++){
|
|
| 437 |
if (rowCover[i]==0 && colCover[j]==0 && (minval > cost(i,j))){
|
|
| 438 |
minval = cost(i,j); |
|
| 439 |
} |
|
| 440 |
} |
|
| 441 |
} |
|
| 442 |
return minval; |
|
| 443 |
} |
|
| 444 |
|
|
| 445 |
// }}} |
|
| 429 | 446 |
|
| 430 | 447 |
template<class real> |
| 431 | 448 |
int hg_step6(int step, Array2D<real> &cost, vec &rowCover, vec &colCover, real maxCost){
|
| ... | ... | |
| 451 | 468 |
} |
| 452 | 469 |
|
| 453 | 470 |
// }}} |
| 454 |
template<class real> |
|
| 455 |
real findSmallest(Array2D<real> &cost, vec &rowCover, vec &colCover, real maxCost){
|
|
| 456 |
// {{{ open
|
|
| 457 |
|
|
| 458 |
real minval = maxCost; //There cannot be a larger cost than this. |
|
| 459 |
for (int i=0; i<cost.getWidth(); i++){ //Now find the smallest uncovered value.
|
|
| 460 |
for (int j=0; j<cost.getHeight(); j++){
|
|
| 461 |
if (rowCover[i]==0 && colCover[j]==0 && (minval > cost(i,j))){
|
|
| 462 |
minval = cost(i,j); |
|
| 463 |
} |
|
| 464 |
} |
|
| 465 |
} |
|
| 466 |
return minval; |
|
| 467 |
} |
|
| 468 |
|
|
| 469 |
// }}} |
|
| 470 | 471 |
|
| 471 | 472 |
template<class real> |
| 472 | 473 |
vec HungarianAlgorithm<real>::apply(const Array2D<real> &m, bool isCostMatrix){
|
| ICLGeom/src/PointCloudCreatorCL.cpp (working copy) | ||
|---|---|---|
| 219 | 219 |
const Vec O, const unsigned int COLOR_W, const unsigned int COLOR_H, const int DEPTH_DIM, |
| 220 | 220 |
DataSegment<float,3> xyz, DataSegment<float,4> rgba, |
| 221 | 221 |
const Img8u *rgbIn,const Array2D<Vec3> &dirs, float depthScaling){
|
| 222 |
|
|
| 222 |
#ifdef HAVE_OPENCL |
|
| 223 | 223 |
cl_uchar needsMapping; |
| 224 | 224 |
if(NEEDS_RAW_TO_MM_MAPPING){
|
| 225 | 225 |
needsMapping=1; |
| ... | ... | |
| 227 | 227 |
needsMapping=0; |
| 228 | 228 |
} |
| 229 | 229 |
|
| 230 |
#ifdef HAVE_OPENCL |
|
| 230 | ||
| 231 | 231 |
try{
|
| 232 | 232 |
depthValuesArray = (float*)depthValues->begin(0); |
| 233 | 233 |
depthValuesBuffer = cl::Buffer(//write new image to buffer |
| ... | ... | |
| 313 | 313 |
const Vec O, const int DEPTH_DIM, |
| 314 | 314 |
DataSegment<float,3> xyz,const Array2D<Vec3> &dirs, float depthScaling){
|
| 315 | 315 |
|
| 316 |
#ifdef HAVE_OPENCL |
|
| 316 | 317 |
cl_uchar needsMapping; |
| 317 | 318 |
if(NEEDS_RAW_TO_MM_MAPPING){
|
| 318 | 319 |
needsMapping=1; |
| ... | ... | |
| 320 | 321 |
needsMapping=0; |
| 321 | 322 |
} |
| 322 | 323 |
|
| 323 |
#ifdef HAVE_OPENCL |
|
| 324 | 324 |
try{
|
| 325 | 325 |
depthValuesArray = (float*)depthValues->begin(0); |
| 326 | 326 |
depthValuesBuffer = cl::Buffer(//write new image to buffer |
| ICLUtils/src/ProcessMonitor.cpp (working copy) | ||
|---|---|---|
| 41 | 41 |
//#include <sys/time.h> |
| 42 | 42 |
//#include <sys/resource.h> |
| 43 | 43 |
//#include <sys/types.h> |
| 44 |
//#include <unistd.h>
|
|
| 44 |
#include <unistd.h> |
|
| 45 | 45 | |
| 46 | 46 |
namespace icl{
|
| 47 | 47 |
namespace utils{
|
| ICLIO/src/DCGrabber.cpp (working copy) | ||
|---|---|---|
| 36 | 36 |
#include <ICLIO/DCGrabberThread.h> |
| 37 | 37 |
#include <ICLUtils/SignalHandler.h> |
| 38 | 38 |
#include <ICLIO/IOFunctions.h> |
| 39 | ||
| 39 | 40 |
#include <dc1394/iso.h> |
| 41 |
#include <unistd.h> |
|
| 40 | 42 | |
| 41 | 43 |
namespace icl{
|
| 42 | 44 |
namespace io{
|
| ICLIO/src/DCFrameQueue.cpp (working copy) | ||
|---|---|---|
| 36 | 36 |
#include <ICLIO/DC.h> |
| 37 | 37 |
#include <ICLUtils/Macros.h> |
| 38 | 38 | |
| 39 |
#include <unistd.h> |
|
| 40 | ||
| 39 | 41 |
namespace icl{
|
| 40 | 42 |
namespace io{
|
| 41 | 43 |
namespace dc{
|
| 42 | 44 | |