Revision: 57297
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57297
Author: mdewanchand
Date: 2013-06-08 19:56:11 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
Fix for bug [#35400] Dilate Erode Feather Bug - feathering wraps around image
Modified Paths:
--------------
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
Modified:
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
2013-06-08 17:56:45 UTC (rev 57296)
+++
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
2013-06-08 19:56:11 UTC (rev 57297)
@@ -99,14 +99,13 @@
int bufferstarty = inputBuffer->getRect()->ymin;
int miny = y;
- // int maxy = y; // UNUSED
int minx = x - this->m_rad;
int maxx = x + this->m_rad; // UNUSED
miny = max(miny, inputBuffer->getRect()->ymin);
minx = max(minx, inputBuffer->getRect()->xmin);
- // maxy = min(maxy, inputBuffer->getRect()->ymax);
- maxx = min(maxx, inputBuffer->getRect()->xmax);
+ maxx = min(maxx, inputBuffer->getRect()->xmax -1);
+
/* *** this is the main part which is different to
'GaussianXBlurOperation' *** */
int step = getStep();
int offsetadd = getOffsetAdd();
Modified:
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
2013-06-08 17:56:45 UTC (rev 57296)
+++
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
2013-06-08 19:56:11 UTC (rev 57297)
@@ -101,11 +101,9 @@
int miny = y - this->m_rad;
int maxy = y + this->m_rad;
int minx = x;
- // int maxx = x; // UNUSED
miny = max(miny, inputBuffer->getRect()->ymin);
minx = max(minx, inputBuffer->getRect()->xmin);
maxy = min(maxy, inputBuffer->getRect()->ymax - 1);
- // maxx = min(maxx, inputBuffer->getRect()->xmax);
/* *** this is the main part which is different to
'GaussianYBlurOperation' *** */
int step = getStep();
Modified:
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2013-06-08 17:56:45 UTC (rev 57296)
+++
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2013-06-08 19:56:11 UTC (rev 57297)
@@ -83,12 +83,10 @@
int bufferstarty = inputBuffer->getRect()->ymin;
int miny = y;
- // int maxy = y; // UNUSED
int minx = x - this->m_rad;
int maxx = x + this->m_rad;
miny = max(miny, inputBuffer->getRect()->ymin);
minx = max(minx, inputBuffer->getRect()->xmin);
- // maxy = min(maxy, inputBuffer->getRect()->ymax);
maxx = min(maxx, inputBuffer->getRect()->xmax - 1);
int step = getStep();
Modified:
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2013-06-08 17:56:45 UTC (rev 57296)
+++
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2013-06-08 19:56:11 UTC (rev 57297)
@@ -85,11 +85,9 @@
int miny = y - this->m_rad;
int maxy = y + this->m_rad;
int minx = x;
- // int maxx = x; // UNUSED
miny = max(miny, inputBuffer->getRect()->ymin);
minx = max(minx, inputBuffer->getRect()->xmin);
maxy = min(maxy, inputBuffer->getRect()->ymax - 1);
- // maxx = min(maxx, inputBuffer->getRect()->xmax);
int index;
int step = getStep();
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
