Title: [90105] trunk/Source/WebCore
- Revision
- 90105
- Author
- [email protected]
- Date
- 2011-06-30 04:19:40 -0700 (Thu, 30 Jun 2011)
Log Message
2011-06-30 Gabor Loki <[email protected]>
Reviewed by Csaba Osztrogonác.
Fixed several style and typo issues after r90091.
https://bugs.webkit.org/show_bug.cgi?id=63692
Rename yStart to extremaStartY during computing extremas
* platform/graphics/filters/FEMorphology.cpp:
(WebCore::FEMorphology::platformApplyGeneric):
* platform/graphics/filters/FEMorphology.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90104 => 90105)
--- trunk/Source/WebCore/ChangeLog 2011-06-30 11:08:57 UTC (rev 90104)
+++ trunk/Source/WebCore/ChangeLog 2011-06-30 11:19:40 UTC (rev 90105)
@@ -1,3 +1,16 @@
+2011-06-30 Gabor Loki <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ Fixed several style and typo issues after r90091.
+ https://bugs.webkit.org/show_bug.cgi?id=63692
+
+ Rename yStart to extremaStartY during computing extremas
+
+ * platform/graphics/filters/FEMorphology.cpp:
+ (WebCore::FEMorphology::platformApplyGeneric):
+ * platform/graphics/filters/FEMorphology.h:
+
2011-06-30 Oliver Varga <[email protected]>
Reviewed by Nikolas Zimmermann.
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (90104 => 90105)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2011-06-30 11:08:57 UTC (rev 90104)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2011-06-30 11:19:40 UTC (rev 90105)
@@ -107,7 +107,7 @@
ByteArray* dstPixelArray = paintingData->dstPixelArray;
const int width = paintingData->width;
const int height = paintingData->height;
- const int effectWidth = width * 4;
+ const int effectWidth = width * 4;
const int radiusX = paintingData->radiusX;
const int radiusY = paintingData->radiusY;
@@ -119,9 +119,9 @@
extrema.clear();
// Compute extremas for each columns
for (int x = 0; x <= radiusX; ++x) {
- unsigned char columnExtrema = srcPixelArray->get(yStart * effectWidth + 4 * x + clrChannel);
+ unsigned char columnExtrema = srcPixelArray->get(extremaStartY * effectWidth + 4 * x + clrChannel);
for (int eY = extremaStartY + 1; eY < extremaEndY; ++eY) {
- unsigned char pixel = srcPixelArray->get(eY * effectWidth + 4 * x + clrChannel);
+ unsigned char pixel = srcPixelArray->get(eY * effectWidth + 4 * x + clrChannel);
if ((m_type == FEMORPHOLOGY_OPERATOR_ERODE && pixel <= columnExtrema)
|| (m_type == FEMORPHOLOGY_OPERATOR_DILATE && pixel >= columnExtrema)) {
columnExtrema = pixel;
@@ -134,9 +134,9 @@
// Kernel is filled, get extrema of next column
for (int x = 0; x < width; ++x) {
const int endX = min(x + radiusX, width - 1);
- unsigned char columnExtrema = srcPixelArray->get(extremaStartY * effectWidth + endX * 4 + clrChannel);
+ unsigned char columnExtrema = srcPixelArray->get(extremaStartY * effectWidth + endX * 4 + clrChannel);
for (int i = extremaStartY + 1; i <= extremaEndY; ++i) {
- unsigned char pixel = srcPixelArray->get(i * effectWidth + endX * 4 + clrChannel);
+ unsigned char pixel = srcPixelArray->get(i * effectWidth + endX * 4 + clrChannel);
if ((m_type == FEMORPHOLOGY_OPERATOR_ERODE && pixel <= columnExtrema)
|| (m_type == FEMORPHOLOGY_OPERATOR_DILATE && pixel >= columnExtrema))
columnExtrema = pixel;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h (90104 => 90105)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h 2011-06-30 11:08:57 UTC (rev 90104)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h 2011-06-30 11:19:40 UTC (rev 90105)
@@ -75,7 +75,7 @@
static void platformApplyWorker(PlatformApplyParameters*);
#endif
- void platformApply(PaintingData*);
+ inline void platformApply(PaintingData*);
inline void platformApplyGeneric(PaintingData*, const int yStart, const int yEnd);
private:
FEMorphology(Filter*, MorphologyOperatorType, float radiusX, float radiusY);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
