[webkit-changes] cvs commit: WebCore/kcanvas/device/quartz
KCanvasFilterQuartz.mm
Maciej
mjs at opensource.apple.com
Sat Dec 10 16:07:26 PST 2005
mjs 05/12/10 16:07:26
Modified: . ChangeLog
kcanvas KCanvasFilters.h
kcanvas/device/quartz KCanvasFilterQuartz.mm
Log:
Reviewed by Darin and Tim Hatcher.
- fix WebCore SVG build for gcc 3.3 (don't know why it has these complaints)
* kcanvas/KCanvasFilters.h:
(QPointF::QPointF): Add a default constructor
(KCanvasFEConvolveMatrix::KCanvasFEConvolveMatrix): ditto
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
(KCanvasFEBlendQuartz::getCIFilter): Move a variable declaration
instead exception blocking
(KCanvasFECompositeQuartz::getCIFilter): ditto
(KCanvasFEMergeQuartz::getCIFilter): ditto
Revision Changes Path
1.504 +15 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- ChangeLog 10 Dec 2005 20:40:09 -0000 1.503
+++ ChangeLog 11 Dec 2005 00:07:20 -0000 1.504
@@ -1,3 +1,18 @@
+2005-12-10 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin and Tim Hatcher.
+
+ - fix WebCore SVG build for gcc 3.3 (don't know why it has these complaints)
+
+ * kcanvas/KCanvasFilters.h:
+ (QPointF::QPointF): Add a default constructor
+ (KCanvasFEConvolveMatrix::KCanvasFEConvolveMatrix): ditto
+ * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+ (KCanvasFEBlendQuartz::getCIFilter): Move a variable declaration
+ instead exception blocking
+ (KCanvasFECompositeQuartz::getCIFilter): ditto
+ (KCanvasFEMergeQuartz::getCIFilter): ditto
+
2005-12-10 Darin Adler <darin at apple.com>
Reviewed by John Sullivan.
1.14 +6 -1 WebCore/kcanvas/KCanvasFilters.h
Index: KCanvasFilters.h
===================================================================
RCS file: /cvs/root/WebCore/kcanvas/KCanvasFilters.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- KCanvasFilters.h 28 Nov 2005 23:57:35 -0000 1.13
+++ KCanvasFilters.h 11 Dec 2005 00:07:25 -0000 1.14
@@ -81,6 +81,8 @@
class QPointF {
public:
QPointF(float x, float y) : m_x(x), m_y(y) { }
+ // this constructor is needed for building on gcc 3.3
+ QPointF() { }
float x() const { return m_x; }
void setX(float x) { m_x = x; }
@@ -157,7 +159,8 @@
class KCanvasFilterEffect
{
public:
- KCanvasFilterEffect() { };
+ // this default constructor is only needed for gcc 3.3
+ KCanvasFilterEffect() { }
virtual ~KCanvasFilterEffect() { };
virtual KCFilterEffectType effectType() const { return FE_TURBULENCE; }
@@ -345,6 +348,8 @@
class KCanvasFEConvolveMatrix : public KCanvasFilterEffect
{
public:
+ KCanvasFEConvolveMatrix() { };
+
QSize kernelSize() const { return m_kernelSize; }
void setKernelSize(QSize kernelSize) { m_kernelSize = kernelSize; }
1.18 +3 -3 WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
Index: KCanvasFilterQuartz.mm
===================================================================
RCS file: /cvs/root/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- KCanvasFilterQuartz.mm 28 Nov 2005 23:33:59 -0000 1.17
+++ KCanvasFilterQuartz.mm 11 Dec 2005 00:07:25 -0000 1.18
@@ -282,8 +282,8 @@
CIFilter *KCanvasFEBlendQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- CIFilter *filter = nil;
KWQ_BLOCK_EXCEPTIONS
+ CIFilter *filter = nil;
switch(blendMode()) {
case BM_NORMAL:
@@ -432,8 +432,8 @@
CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
- CIFilter *filter = nil;
KWQ_BLOCK_EXCEPTIONS
+ CIFilter *filter = nil;
switch(operation()) {
case CO_OVER:
filter = [CIFilter filterWithName:@"CISourceOverCompositing"];
@@ -669,8 +669,8 @@
CIFilter *KCanvasFEMergeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
{
// Just stack a bunch of composite source over filters together...
- CIFilter *filter = nil;
KWQ_BLOCK_EXCEPTIONS
+ CIFilter *filter = nil;
QStringList inputs = mergeInputs();
QValueListIterator<QString> it = inputs.begin();
QValueListIterator<QString> end = inputs.end();
More information about the webkit-changes
mailing list