[webkit-changes] cvs commit: SVGSupport/kcanvas/device/quartz
KCanvasFilterQuartz.mm
Eric
eseidel at opensource.apple.com
Thu Sep 22 20:55:00 PDT 2005
eseidel 05/09/22 20:55:00
Modified: . ChangeLog
kcanvas/device/quartz KCanvasFilterQuartz.mm
Log:
Bug #: 4649
Submitted by: Kimmo Kinnunen <kimmo.t.kinnunen at nokia.com>
Reviewed by: eseidel
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
Deployment build fix.
Revision Changes Path
1.148 +8 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog 23 Sep 2005 03:28:25 -0000 1.147
+++ ChangeLog 23 Sep 2005 03:54:59 -0000 1.148
@@ -1,4 +1,12 @@
2005-09-22 Eric Seidel <eseidel at apple.com>
+ Fix by Kimmo Kinnunen <kimmo.t.kinnunen at nokia.com>
+
+ Reviewed by eseidel.
+
+ * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+ Deployment build fix.
+
+2005-09-22 Eric Seidel <eseidel at apple.com>
Reviewed by hyatt.
1.8 +3 -2 SVGSupport/kcanvas/device/quartz/KCanvasFilterQuartz.mm
Index: KCanvasFilterQuartz.mm
===================================================================
RCS file: /cvs/root/SVGSupport/kcanvas/device/quartz/KCanvasFilterQuartz.mm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KCanvasFilterQuartz.mm 8 Sep 2005 08:03:15 -0000 1.7
+++ KCanvasFilterQuartz.mm 23 Sep 2005 03:54:59 -0000 1.8
@@ -277,8 +277,8 @@
#define FE_QUARTZ_SETUP_INPUT(name) \
CIImage *inputImage = quartzFilter->inputImage(this); \
FE_QUARTZ_CHECK_INPUT(inputImage) \
- CIFilter *filter = [CIFilter filterWithName:name]; \
KWQ_BLOCK_EXCEPTIONS \
+ CIFilter *filter = [CIFilter filterWithName:name]; \
[filter setDefaults]; \
[filter setValue:inputImage forKey:@"inputImage"];
@@ -290,8 +290,9 @@
#define FE_QUARTZ_OUTPUT_RETURN \
quartzFilter->setOutputImage(this, [filter valueForKey:@"outputImage"]); \
+ return filter; \
KWQ_UNBLOCK_EXCEPTIONS \
- return filter;
+ return nil;
#define FE_QUARTZ_CROP_TO_RECT(rect) \
{ \
More information about the webkit-changes
mailing list