codebase / stimlib

Commit e3bdbcab8e32102ea2548b7b610d3ad39b6e3cea

Authored by David Mayerich
2 parents 6b747d25 15f80db6

Merge branch 'bsds500' of git.stim.ee.uh.edu:codebase/stimlib

Showing 2 changed files with 12 additions and 5 deletions   Show diff stats
Inline Side-by-side
stim/cuda/conv2.cuh
  Show/Hide comments   View file @e3bdbca
... ... @@ -32,8 +32,8 @@ namespace stim{
32 32  
33 33 if(i < w && j < h){
34 34  
35   - copy[idx] = tex2D<float>(texObj, i+100, j+100);
36   - return;
  35 + //copy[idx] = tex2D<float>(texObj, i, j);
  36 + //return;
37 37  
38 38 //tex2D<float>(texObj, i, j);
39 39  
... ... @@ -54,7 +54,7 @@ namespace stim{
54 54  
55 55 //T temp = img[y * w + x] * mask[yy * M + xx];
56 56 //sum += img[y * w + x] * mask[yy * M + xx];
57   - sum += tex2D<float>(texObj, x, y);// * mask[yy * M + xx];
  57 + sum += tex2D<T>(texObj, x-50, y+100) * mask[yy * M + xx];
58 58 }
59 59 }
60 60 copy[idx] = sum;
... ... @@ -89,8 +89,8 @@ namespace stim{
89 89 // Specify texture object parameters
90 90 struct cudaTextureDesc texDesc; //create a texture descriptor
91 91 memset(&texDesc, 0, sizeof(texDesc)); //set all values in the texture descriptor to zero
92   - texDesc.addressMode[0] = cudaAddressModeWrap; //use wrapping (around the edges)
93   - texDesc.addressMode[1] = cudaAddressModeWrap;
  92 + texDesc.addressMode[0] = cudaAddressModeMirror; //use wrapping (around the edges)
  93 + texDesc.addressMode[1] = cudaAddressModeMirror;
94 94 texDesc.filterMode = cudaFilterModePoint; //use linear filtering
95 95 texDesc.readMode = cudaReadModeElementType; //reads data based on the element type (32-bit floats)
96 96 texDesc.normalizedCoords = 0; //not using normalized coordinates
... ...
stim/image/image_contour_detection.h 0 → 100644
  Show/Hide comments   View file @e3bdbca
  1 +//#include <stim/image/image.h>
  2 +//#include <cmath>
  3 +//#include <stim/visualization/colormap.h>
  4 +
  5 +stim::image<float> gaussian_derivative_filter_odd(stim::image<float> image, float sigma, unsigned int sigma_n, unsigned int winsize, float theta, unsigned int w, unsigned int h);
  6 +stim::image<float> func_mPb_theta(stim::image<float> lab, float theta, unsigned int w, unsigned int h);
  7 +stim::image<float> func_mPb(stim::image<float> lab, unsigned int theta_n, unsigned int w, unsigned int h);
0 8 \ No newline at end of file
... ...