Browse Source

Update lol-core.

legacy
Sam Hocevar 4 years ago
parent
commit
e30a69d43e
6 changed files with 8 additions and 8 deletions
  1. +1
    -1
      lol-core
  2. +1
    -1
      src/image/dither/ediff.cpp
  3. +1
    -1
      src/image/dither/ordered.cpp
  4. +3
    -3
      src/image/filter/convolution.cpp
  5. +1
    -1
      src/image/filter/median.cpp
  6. +1
    -1
      src/image/kernel.cpp

+ 1
- 1
lol-core

@@ -1 +1 @@
Subproject commit b85c7adfe6d9fe0779548736bf5140569e48e919
Subproject commit c1645f5e8b30961419485e8b3f28092900a99148

+ 1
- 1
src/image/dither/ediff.cpp View File

@@ -30,7 +30,7 @@ image image::dither_ediff(array2d<float> const &ker, ScanMode scan) const
image dst = *this; image dst = *this;


ivec2 isize = dst.size(); ivec2 isize = dst.size();
ivec2 ksize = ker.size();
ivec2 ksize = ker.sizes();


int kx; int kx;
for (kx = 0; kx < ksize.x; kx++) for (kx = 0; kx < ksize.x; kx++)


+ 1
- 1
src/image/dither/ordered.cpp View File

@@ -43,7 +43,7 @@ static image dither_helper(image const &img, array2d<float> const &ker,
float scale, float angle) float scale, float angle)
{ {
ivec2 isize = img.size(); ivec2 isize = img.size();
ivec2 ksize = ker.size();
ivec2 ksize = ker.sizes();


float cost = lol::cos(angle); float cost = lol::cos(angle);
float sint = lol::sin(angle); float sint = lol::sin(angle);


+ 3
- 3
src/image/filter/convolution.cpp View File

@@ -26,7 +26,7 @@ static image NonSepConv(image &src, array2d<float> const &in_kernel);
image image::Convolution(array2d<float> const &in_kernel) image image::Convolution(array2d<float> const &in_kernel)
{ {
/* Find the cell with the largest value */ /* Find the cell with the largest value */
ivec2 ksize = in_kernel.size();
ivec2 ksize = in_kernel.sizes();
int bestx = -1, besty = -1; int bestx = -1, besty = -1;
float tmp = 0.f; float tmp = 0.f;
for (int dy = 0; dy < ksize.y; ++dy) for (int dy = 0; dy < ksize.y; ++dy)
@@ -83,7 +83,7 @@ image image::Convolution(array2d<float> const &in_kernel)


image image::Sharpen(array2d<float> const &in_kernel) image image::Sharpen(array2d<float> const &in_kernel)
{ {
ivec2 ksize = in_kernel.size();
ivec2 ksize = in_kernel.sizes();
array2d<float> newkernel(ksize); array2d<float> newkernel(ksize);


for (int dy = 0; dy < ksize.y; ++dy) for (int dy = 0; dy < ksize.y; ++dy)
@@ -103,7 +103,7 @@ static image NonSepConv(image &src, array2d<float> const &in_kernel)
typedef typename PixelType<FORMAT>::type pixel_t; typedef typename PixelType<FORMAT>::type pixel_t;


ivec2 const size = src.size(); ivec2 const size = src.size();
ivec2 const ksize = in_kernel.size();
ivec2 const ksize = in_kernel.sizes();
image dst(size); image dst(size);


array2d<pixel_t> const &srcp = src.lock2d<FORMAT>(); array2d<pixel_t> const &srcp = src.lock2d<FORMAT>();


+ 1
- 1
src/image/filter/median.cpp View File

@@ -166,7 +166,7 @@ image image::Median(array2d<float> const &ker) const
else else
#endif #endif
{ {
ivec2 const ksize = ker.size();
ivec2 const ksize = ker.sizes();
array2d<vec3> list(ksize); array2d<vec3> list(ksize);


vec4 *srcp = tmp.lock<PixelFormat::RGBA_F32>(); vec4 *srcp = tmp.lock<PixelFormat::RGBA_F32>();


+ 1
- 1
src/image/kernel.cpp View File

@@ -184,7 +184,7 @@ static int cmpdot(const void *p1, const void *p2)


array2d<float> image::kernel::normalize(array2d<float> const &kernel) array2d<float> image::kernel::normalize(array2d<float> const &kernel)
{ {
ivec2 size = kernel.size();
ivec2 size = kernel.sizes();


array<Dot> tmp; array<Dot> tmp;
tmp.resize(size.x * size.y); tmp.resize(size.x * size.y);


Loading…
Cancel
Save