[webkit-changes] cvs commit: SVGSupport/WebCore+SVG DrawDocument.mm
Eric
eseidel at opensource.apple.com
Sun Sep 18 14:45:30 PDT 2005
eseidel 05/09/18 14:45:29
Modified: . ChangeLog
kdom/cache KDOMLoader.cpp
ksvg2/svg SVGAngleImpl.cpp
SVGComponentTransferFunctionElementImpl.cpp
SVGFEGaussianBlurElementImpl.cpp
SVGFEOffsetElementImpl.cpp
SVGFETurbulenceElementImpl.cpp
SVGFitToViewBoxImpl.cpp SVGNumberListImpl.cpp
SVGStopElementImpl.cpp
WebCore+SVG DrawDocument.mm
Log:
Bug #: 5045
Submitted by: eseidel
Reviewed by: none needed, svg build fix only.
* WebCore+SVG/DrawDocument.mm:
(-[DrawView primaryView]): cast to DrawView * (newer gcc fix)
* kdom/cache/KDOMLoader.cpp:
(Loader::slotFinished): toLong -> toInt
* ksvg2/svg/SVGAngleImpl.cpp:
(SVGAngleImpl::setValueAsString): toFloat -> toDouble
* ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp:
(SVGComponentTransferFunctionElementImpl::parseAttribute): ditto
* ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp:
(SVGFEGaussianBlurElementImpl::parseAttribute): ditto
* ksvg2/svg/SVGFEOffsetElementImpl.cpp:
(SVGFEOffsetElementImpl::parseAttribute): ditto
* ksvg2/svg/SVGFETurbulenceElementImpl.cpp:
(SVGFETurbulenceElementImpl::parseAttribute): ditto
* ksvg2/svg/SVGFitToViewBoxImpl.cpp:
(SVGFitToViewBoxImpl::parseViewBox): ditto
* ksvg2/svg/SVGNumberListImpl.cpp:
(SVGNumberListImpl::parse): ditto
* ksvg2/svg/SVGStopElementImpl.cpp:
(SVGStopElementImpl::parseAttribute): ditto
Revision Changes Path
1.131 +25 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog 16 Sep 2005 23:09:58 -0000 1.130
+++ ChangeLog 18 Sep 2005 21:45:25 -0000 1.131
@@ -1,3 +1,28 @@
+2005-09-18 Eric Seidel <eseidel at apple.com>
+
+ No review needed, SVG build fix only.
+
+ * WebCore+SVG/DrawDocument.mm:
+ (-[DrawView primaryView]): cast to DrawView * (newer gcc fix)
+ * kdom/cache/KDOMLoader.cpp:
+ (Loader::slotFinished): toLong -> toInt
+ * ksvg2/svg/SVGAngleImpl.cpp:
+ (SVGAngleImpl::setValueAsString): toFloat -> toDouble
+ * ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp:
+ (SVGComponentTransferFunctionElementImpl::parseAttribute): ditto
+ * ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp:
+ (SVGFEGaussianBlurElementImpl::parseAttribute): ditto
+ * ksvg2/svg/SVGFEOffsetElementImpl.cpp:
+ (SVGFEOffsetElementImpl::parseAttribute): ditto
+ * ksvg2/svg/SVGFETurbulenceElementImpl.cpp:
+ (SVGFETurbulenceElementImpl::parseAttribute): ditto
+ * ksvg2/svg/SVGFitToViewBoxImpl.cpp:
+ (SVGFitToViewBoxImpl::parseViewBox): ditto
+ * ksvg2/svg/SVGNumberListImpl.cpp:
+ (SVGNumberListImpl::parse): ditto
+ * ksvg2/svg/SVGStopElementImpl.cpp:
+ (SVGStopElementImpl::parseAttribute): ditto
+
2005-09-16 Adele Peterson <adele at apple.com>
Rolling out the fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4924
1.9 +1 -1 SVGSupport/kdom/cache/KDOMLoader.cpp
Index: KDOMLoader.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMLoader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KDOMLoader.cpp 8 Sep 2005 08:03:18 -0000 1.8
+++ KDOMLoader.cpp 18 Sep 2005 21:45:26 -0000 1.9
@@ -355,7 +355,7 @@
r->object->data(r->buffer, true);
emit requestDone(r->docLoader, r->object);
- time_t expireDate = j->queryMetaData(QString::fromLatin1("expire-date")).toLong();
+ time_t expireDate = j->queryMetaData(QString::fromLatin1("expire-date")).toInt();
#ifdef LOADER_DEBUG
kdDebug() << "Loader::slotFinished, url = " << j->url().url() << endl;
1.5 +1 -1 SVGSupport/ksvg2/svg/SVGAngleImpl.cpp
Index: SVGAngleImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGAngleImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGAngleImpl.cpp 1 Sep 2005 07:35:31 -0000 1.4
+++ SVGAngleImpl.cpp 18 Sep 2005 21:45:26 -0000 1.5
@@ -92,7 +92,7 @@
QString s = m_valueAsString.string();
bool bOK;
- m_valueInSpecifiedUnits = s.toFloat(&bOK);
+ m_valueInSpecifiedUnits = s.toDouble(&bOK);
m_unitType = SVG_ANGLETYPE_UNSPECIFIED;
if(!bOK)
1.6 +5 -5 SVGSupport/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp
Index: SVGComponentTransferFunctionElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGComponentTransferFunctionElementImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGComponentTransferFunctionElementImpl.cpp 1 Sep 2005 09:39:14 -0000 1.5
+++ SVGComponentTransferFunctionElementImpl.cpp 18 Sep 2005 21:45:27 -0000 1.6
@@ -135,27 +135,27 @@
}
case ATTR_SLOPE:
{
- slope()->setBaseVal(value.string().toFloat());
+ slope()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_INTERCEPT:
{
- intercept()->setBaseVal(value.string().toFloat());
+ intercept()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_AMPLITUDE:
{
- amplitude()->setBaseVal(value.string().toFloat());
+ amplitude()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_EXPONENT:
{
- exponent()->setBaseVal(value.string().toFloat());
+ exponent()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_OFFSET:
{
- offset()->setBaseVal(value.string().toFloat());
+ offset()->setBaseVal(value.string().toDouble());
break;
}
default:
1.6 +3 -3 SVGSupport/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp
Index: SVGFEGaussianBlurElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGFEGaussianBlurElementImpl.cpp 1 Sep 2005 09:39:15 -0000 1.5
+++ SVGFEGaussianBlurElementImpl.cpp 18 Sep 2005 21:45:27 -0000 1.6
@@ -91,11 +91,11 @@
case ATTR_STDDEVIATION:
{
QStringList numbers = QStringList::split(' ', value.string());
- stdDeviationX()->setBaseVal(numbers[0].toFloat());
+ stdDeviationX()->setBaseVal(numbers[0].toDouble());
if(numbers.count() == 1)
- stdDeviationY()->setBaseVal(numbers[0].toFloat());
+ stdDeviationY()->setBaseVal(numbers[0].toDouble());
else
- stdDeviationY()->setBaseVal(numbers[1].toFloat());
+ stdDeviationY()->setBaseVal(numbers[1].toDouble());
break;
}
1.6 +2 -2 SVGSupport/ksvg2/svg/SVGFEOffsetElementImpl.cpp
Index: SVGFEOffsetElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFEOffsetElementImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGFEOffsetElementImpl.cpp 1 Sep 2005 09:39:15 -0000 1.5
+++ SVGFEOffsetElementImpl.cpp 18 Sep 2005 21:45:27 -0000 1.6
@@ -86,12 +86,12 @@
{
case ATTR_DX:
{
- dx()->setBaseVal(value.string().toFloat());
+ dx()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_DY:
{
- dy()->setBaseVal(value.string().toFloat());
+ dy()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_IN:
1.7 +4 -4 SVGSupport/ksvg2/svg/SVGFETurbulenceElementImpl.cpp
Index: SVGFETurbulenceElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFETurbulenceElementImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGFETurbulenceElementImpl.cpp 1 Sep 2005 09:39:15 -0000 1.6
+++ SVGFETurbulenceElementImpl.cpp 18 Sep 2005 21:45:27 -0000 1.7
@@ -129,17 +129,17 @@
case ATTR_BASEFREQUENCY:
{
QStringList numbers = QStringList::split(' ', value.string());
- baseFrequencyX()->setBaseVal(numbers[0].toFloat());
+ baseFrequencyX()->setBaseVal(numbers[0].toDouble());
if(numbers.count() == 1)
- baseFrequencyY()->setBaseVal(numbers[0].toFloat());
+ baseFrequencyY()->setBaseVal(numbers[0].toDouble());
else
- baseFrequencyY()->setBaseVal(numbers[1].toFloat());
+ baseFrequencyY()->setBaseVal(numbers[1].toDouble());
break;
}
case ATTR_SEED:
{
- seed()->setBaseVal(value.string().toFloat());
+ seed()->setBaseVal(value.string().toDouble());
break;
}
case ATTR_NUMOCTAVES:
1.6 +4 -4 SVGSupport/ksvg2/svg/SVGFitToViewBoxImpl.cpp
Index: SVGFitToViewBoxImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFitToViewBoxImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGFitToViewBoxImpl.cpp 1 Sep 2005 09:39:15 -0000 1.5
+++ SVGFitToViewBoxImpl.cpp 18 Sep 2005 21:45:27 -0000 1.6
@@ -80,10 +80,10 @@
QStringList points = QStringList::split(' ', viewbox.replace(',', ' ').simplifyWhiteSpace());
if (points.count() == 4) {
- viewBox()->baseVal()->setX(points[0].toFloat());
- viewBox()->baseVal()->setY(points[1].toFloat());
- viewBox()->baseVal()->setWidth(points[2].toFloat());
- viewBox()->baseVal()->setHeight(points[3].toFloat());
+ viewBox()->baseVal()->setX(points[0].toDouble());
+ viewBox()->baseVal()->setY(points[1].toDouble());
+ viewBox()->baseVal()->setWidth(points[2].toDouble());
+ viewBox()->baseVal()->setHeight(points[3].toDouble());
} else {
fprintf(stderr, "WARNING: Malformed viewbox string: %s (l: %i)", viewbox.ascii(), viewbox.length());
}
1.4 +1 -1 SVGSupport/ksvg2/svg/SVGNumberListImpl.cpp
Index: SVGNumberListImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGNumberListImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGNumberListImpl.cpp 1 Sep 2005 07:35:45 -0000 1.3
+++ SVGNumberListImpl.cpp 18 Sep 2005 21:45:27 -0000 1.4
@@ -44,7 +44,7 @@
for(unsigned int i = 0;i < numbers.count();i++)
{
SVGNumberImpl *number = new SVGNumberImpl(context);
- number->setValue(numbers[i].toFloat());
+ number->setValue(numbers[i].toDouble());
appendItem(number);
}
}
1.6 +2 -2 SVGSupport/ksvg2/svg/SVGStopElementImpl.cpp
Index: SVGStopElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGStopElementImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGStopElementImpl.cpp 1 Sep 2005 09:39:16 -0000 1.5
+++ SVGStopElementImpl.cpp 18 Sep 2005 21:45:28 -0000 1.6
@@ -61,9 +61,9 @@
case ATTR_OFFSET:
{
if(value.string().endsWith(QString::fromLatin1("%")))
- offset()->setBaseVal(value.string().left(value.length() - 1).toFloat() / 100.);
+ offset()->setBaseVal(value.string().left(value.length() - 1).toDouble() / 100.);
else
- offset()->setBaseVal(value.string().toFloat());
+ offset()->setBaseVal(value.string().toDouble());
break;
}
default:
1.6 +1 -1 SVGSupport/WebCore+SVG/DrawDocument.mm
Index: DrawDocument.mm
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/DrawDocument.mm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DrawDocument.mm 8 Sep 2005 08:03:07 -0000 1.5
+++ DrawDocument.mm 18 Sep 2005 21:45:29 -0000 1.6
@@ -257,7 +257,7 @@
- (DrawView *)primaryView
{
if (_private->primaryView)
- return _private->primaryView->view();
+ return (DrawView *)_private->primaryView->view();
return nil;
}
More information about the webkit-changes
mailing list