Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T47452: Translate-node seams w/ subpixel offset

Browse Source
This commit is contained in:
Campbell Barton
2016-02-18 01:28:41 +11:00
parent 8512a8b956
commit 578f98d7ad
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_math_interp.h
View File

@@ -45,6 +45,12 @@ void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width
void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height, void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v); int components, float u, float v);
void BLI_bilinear_interpolation_wrap_fl(const float *buffer, float *output, int width, int height,
int components, float u, float v, bool wrap_x, bool wrap_y);
void BLI_bilinear_interpolation_wrap_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v, bool wrap_x, bool wrap_y);
#define EWA_MAXIDX 255 #define EWA_MAXIDX 255
extern const float EWA_WTS[EWA_MAXIDX + 1]; extern const float EWA_WTS[EWA_MAXIDX + 1];

37
source/blender/blenlib/intern/math_interp.c
View File

@@ -262,7 +262,7 @@ void BLI_bicubic_interpolation_char(const unsigned char *buffer, unsigned char *
/* BILINEAR INTERPOLATION */ /* BILINEAR INTERPOLATION */
BLI_INLINE void bilinear_interpolation(const unsigned char *byte_buffer, const float *float_buffer, BLI_INLINE void bilinear_interpolation(const unsigned char *byte_buffer, const float *float_buffer,
unsigned char *byte_output, float *float_output, int width, int height, unsigned char *byte_output, float *float_output, int width, int height,
int components, float u, float v) int components, float u, float v, bool wrap_x, bool wrap_y)
{ {
float a, b; float a, b;
float a_b, ma_b, a_mb, ma_mb; float a_b, ma_b, a_mb, ma_mb;
@@ -279,11 +279,21 @@ BLI_INLINE void bilinear_interpolation(const unsigned char *byte_buffer, const f
const float *row1, *row2, *row3, *row4; const float *row1, *row2, *row3, *row4;
float empty[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float empty[4] = {0.0f, 0.0f, 0.0f, 0.0f};
/* sample area entirely outside image? */ /* pixel value must be already wrapped, however values at boundaries may flip */
if (x2 < 0 || x1 > width - 1 || y2 < 0 || y1 > height - 1) { if (wrap_x) {
copy_vn_fl(float_output, components, 0.0f); if (x1 < 0) x1 = width - 1;
return; if (x2 >= width) x2 = 0;
} }
if (wrap_y) {
if (y1 < 0) y1 = height - 1;
if (y2 >= height) y2 = 0;
}
CLAMP(x1, 0, width - 1);
CLAMP(x2, 0, width - 1);
CLAMP(y1, 0, height - 1);
CLAMP(y2, 0, height - 1);
/* sample including outside of edges of image */ /* sample including outside of edges of image */
if (x1 < 0 || y1 < 0) row1 = empty; if (x1 < 0 || y1 < 0) row1 = empty;
@@ -364,15 +374,28 @@ BLI_INLINE void bilinear_interpolation(const unsigned char *byte_buffer, const f
void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width, int height, void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width, int height,
int components, float u, float v) int components, float u, float v)
{ {
bilinear_interpolation(NULL, buffer, NULL, output, width, height, components, u, v); bilinear_interpolation(NULL, buffer, NULL, output, width, height, components, u, v, false, false);
} }
void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height, void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v) int components, float u, float v)
{ {
bilinear_interpolation(buffer, NULL, output, NULL, width, height, components, u, v); bilinear_interpolation(buffer, NULL, output, NULL, width, height, components, u, v, false, false);
} }
void BLI_bilinear_interpolation_wrap_fl(const float *buffer, float *output, int width, int height,
int components, float u, float v, bool wrap_x, bool wrap_y)
{
bilinear_interpolation(NULL, buffer, NULL, output, width, height, components, u, v, wrap_x, wrap_y);
}
void BLI_bilinear_interpolation_wrap_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v, bool wrap_x, bool wrap_y)
{
bilinear_interpolation(buffer, NULL, output, NULL, width, height, components, u, v, wrap_x, wrap_y);
}
/************************************************************************** /**************************************************************************
* Filtering method based on * Filtering method based on
* "Creating raster omnimax images from multiple perspective views using the elliptical weighted average filter" * "Creating raster omnimax images from multiple perspective views using the elliptical weighted average filter"

4
source/blender/compositor/intern/COM_MemoryBuffer.h
View File

@@ -259,7 +259,9 @@ public:
float u = x; float u = x;
float v = y; float v = y;
this->wrap_pixel(u, v, extend_x, extend_y); this->wrap_pixel(u, v, extend_x, extend_y);
BLI_bilinear_interpolation_fl(this->m_buffer, result, this->m_width, this->m_height, this->m_num_channels, u, v); BLI_bilinear_interpolation_wrap_fl(
this->m_buffer, result, this->m_width, this->m_height, this->m_num_channels, u, v,
extend_x == COM_MB_REPEAT, extend_y == COM_MB_REPEAT);
} }
void readEWA(float *result, const float uv[2], const float derivatives[2][2]); void readEWA(float *result, const float uv[2], const float derivatives[2][2]);