r15071 by fschmid - Reverted committ #15023 as it doesn't work correctly with large negative numbers. qMax(-2.2*10e308, -7777.0) returns 2.2*10e308 instead of -7777.0 ?!?? wtf ??
scribus-commit
scribus-commit at lists.scribus.net
Fri May 14 14:02:01 CEST 2010
Revision: 15071
Author: fschmid
Date: 2010-05-14T11:51:32.791109Z
Commit message: Reverted committ #15023 as it doesn't work correctly with large negative numbers.
qMax(-2.2*10e308, -7777.0) returns 2.2*10e308 instead of -7777.0 ?!?? wtf ??
Changeset:
M /trunk/Scribus/scribus/plugins/import/ps/importps.cpp
M /trunk/Scribus/scribus/pageitem.cpp
M /trunk/Scribus/scribus/scribusXml.cpp
M /trunk/Scribus/scribus/scribusdoc.cpp
M /trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
M /trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
M /trunk/Scribus/scribus/scpreview.cpp
M /trunk/Scribus/scribus/pdflib_core.cpp
M /trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
M /trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
M /trunk/Scribus/scribus/pslib.cpp
M /trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
M /trunk/Scribus/scribus/scribus.cpp
M /trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
M /trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
M /trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
M /trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
M /trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
Diffs:
Index: scribus/pdflib_core.cpp
===================================================================
--- scribus/pdflib_core.cpp (revision 15070)
+++ scribus/pdflib_core.cpp (revision 15071)
@@ -1082,10 +1082,10 @@
UsedFontsP.insert(it.key(), "/Fo"+QString::number(a));
uint SubFonts = 0;
int glyphCount = 0;
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
QList<uint> glyphWidths;
QStringList charProcs;
QString encoding = "<< /Type /Encoding\n/Differences [ 0\n";
@@ -1196,10 +1196,10 @@
// glyphMapping.clear();
glyphCount = 0;
++SubFonts;
- minx = 99999.9;
- miny = 99999.9;
- maxx = -99999.9;
- maxy = -99999.9;
+ minx = 999999.9;
+ miny = 999999.9;
+ maxx = -999999.9;
+ maxy = -999999.9;
encoding = "<< /Type /Encoding\n/Differences [ 0\n";
}
}
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp (revision 15070)
+++ scribus/scribusdoc.cpp (revision 15071)
@@ -4655,10 +4655,14 @@
void ScribusDoc::canvasMinMax(FPoint& minPoint, FPoint& maxPoint)
{
PageItem *currItem;
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
uint docItemsCount=Items->count();
if (docItemsCount != 0)
{
@@ -8942,8 +8946,10 @@
newX=currentPage()->xOffset() + guidePosition;
break;
case alignSelection:
- double minX = std::numeric_limits<double>::max();
- double maxX = std::numeric_limits<double>::min();
+ // double minX = std::numeric_limits<double>::max();
+ // double maxX = std::numeric_limits<double>::min();
+ double minX = 9999999.9;
+ double maxX = -9999999.9;
for (uint a = 0; a < alignObjectsCount; ++a)
{
minX = qMin(AObjects[a].x1, minX);
@@ -8969,7 +8975,8 @@
return;
uint alignObjectsCount=AObjects.count();
int loopStart=0, loopEnd=alignObjectsCount-1;
- double newX = std::numeric_limits<double>::min();
+// double newX = std::numeric_limits<double>::min();
+ double newX = -9999999.9;
switch ( currAlignTo )
{
case alignFirst:
@@ -9014,7 +9021,8 @@
return;
uint alignObjectsCount=AObjects.count();
int loopStart=0, loopEnd=alignObjectsCount-1;
- double newX = std::numeric_limits<double>::min();
+// double newX = std::numeric_limits<double>::min();
+ double newX = -9999999.9;
switch ( currAlignTo )
{
case alignFirst:
@@ -9172,8 +9180,10 @@
newY=currentPage()->yOffset() + guidePosition;
break;
case alignSelection:
- double minY = std::numeric_limits<double>::max();
- double maxY = std::numeric_limits<double>::min();
+ // double minY = std::numeric_limits<double>::max();
+ // double maxY = std::numeric_limits<double>::min();
+ double minY = 9999999.9;
+ double maxY = -9999999.9;
for (uint a = 0; a < alignObjectsCount; ++a)
{
minY = qMin(AObjects[a].y1, minY);
@@ -9199,7 +9209,8 @@
return;
uint alignObjectsCount=AObjects.count();
int loopStart=0, loopEnd=alignObjectsCount-1;
- double newY = std::numeric_limits<double>::min();
+// double newY = std::numeric_limits<double>::min();
+ double newY = -9999999.9;
switch ( currAlignTo )
{
case alignFirst:
@@ -9244,7 +9255,8 @@
return;
uint alignObjectsCount=AObjects.count();
int loopStart=0, loopEnd=alignObjectsCount-1;
- double newY = std::numeric_limits<double>::min();
+// double newY = std::numeric_limits<double>::min();
+ double newY = -9999999.9;
switch ( currAlignTo )
{
case alignFirst:
@@ -9919,8 +9931,10 @@
int itemIndex=itX.value(); //get our first item's index in the AObjects array
// bool found=false;
// double itXX=itX.key();
- minY = std::numeric_limits<double>::max();
- maxY = std::numeric_limits<double>::min();
+// minY = std::numeric_limits<double>::max();
+// maxY = std::numeric_limits<double>::min();
+ minY = 9999999.9;
+ maxY = -9999999.9;
int nextItemIndex=itemIndex;
circleList.append(nextItemIndex);
++circleListCounter;
@@ -11183,10 +11197,14 @@
lowestItem = qMin(lowestItem, currItem->ItemNr);
highestItem = qMax(highestItem, currItem->ItemNr);
}
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
for (uint ep = 0; ep < selectedItemCount; ++ep)
{
PageItem* currItem = itemSelection->itemAt(ep);
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp (revision 15070)
+++ scribus/scribusXml.cpp (revision 15071)
@@ -2164,10 +2164,14 @@
{
if (item->rotation() != 0)
{
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
double xpo = item->xPos() - doc->currentPage()->xOffset();
double ypo = item->yPos() - doc->currentPage()->yOffset();
FPointArray pb(4);
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp (revision 15070)
+++ scribus/pageitem.cpp (revision 15071)
@@ -2211,10 +2211,14 @@
{
QList<PageItem*> emG;
emG.clear();
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
if (Groups.count() != 0)
{
for (int ga=0; ga<m_Doc->Items->count(); ++ga)
@@ -5662,10 +5666,14 @@
void PageItem::getBoundingRect(double *x1, double *y1, double *x2, double *y2) const
{
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
if (Rot != 0)
{
FPointArray pb;
@@ -5804,10 +5812,14 @@
void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const
{
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
double extraSpace = 0.0;
if (NamedLStyle.isEmpty())
{
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp (revision 15070)
+++ scribus/scribus.cpp (revision 15071)
@@ -9740,10 +9740,14 @@
int ae = doc->Items->count();
if ((docSelectionCount > 1) && (!isGroup))
{
- double minx = std::numeric_limits<double>::max();
- double miny = std::numeric_limits<double>::max();
- double maxx = std::numeric_limits<double>::min();
- double maxy = std::numeric_limits<double>::min();
+// double minx = std::numeric_limits<double>::max();
+// double miny = std::numeric_limits<double>::max();
+// double maxx = std::numeric_limits<double>::min();
+// double maxy = std::numeric_limits<double>::min();
+ double minx = 9999999.9;
+ double miny = 9999999.9;
+ double maxx = -9999999.9;
+ double maxy = -9999999.9;
for (int as = ac+1; as < ae; ++as)
{
PageItem* currItem = doc->Items->at(as);
Index: scribus/plugins/import/cvg/importcvg.cpp
===================================================================
--- scribus/plugins/import/cvg/importcvg.cpp (revision 15070)
+++ scribus/plugins/import/cvg/importcvg.cpp (revision 15071)
@@ -105,10 +105,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -303,10 +303,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/svg/svgplugin.cpp
===================================================================
--- scribus/plugins/import/svg/svgplugin.cpp (revision 15070)
+++ scribus/plugins/import/svg/svgplugin.cpp (revision 15071)
@@ -309,10 +309,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -546,10 +546,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -1209,10 +1209,10 @@
}
else
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
GElements.append(neu);
for (int gr = 0; gr < gElements.count(); ++gr)
{
Index: scribus/plugins/import/ps/importps.cpp
===================================================================
--- scribus/plugins/import/ps/importps.cpp (revision 15070)
+++ scribus/plugins/import/ps/importps.cpp (revision 15071)
@@ -247,10 +247,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/cgm/importcgm.cpp
===================================================================
--- scribus/plugins/import/cgm/importcgm.cpp (revision 15070)
+++ scribus/plugins/import/cgm/importcgm.cpp (revision 15071)
@@ -109,10 +109,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -304,10 +304,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/pct/importpct.cpp
===================================================================
--- scribus/plugins/import/pct/importpct.cpp (revision 15070)
+++ scribus/plugins/import/pct/importpct.cpp (revision 15071)
@@ -108,10 +108,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -304,10 +304,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/wmf/wmfimport.cpp
===================================================================
--- scribus/plugins/import/wmf/wmfimport.cpp (revision 15070)
+++ scribus/plugins/import/wmf/wmfimport.cpp (revision 15071)
@@ -373,10 +373,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -722,10 +722,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/xar/importxar.cpp
===================================================================
--- scribus/plugins/import/xar/importxar.cpp (revision 15070)
+++ scribus/plugins/import/xar/importxar.cpp (revision 15071)
@@ -262,10 +262,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -3493,10 +3493,10 @@
}
else
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
PageItem* groupItem = Elements.at(gg.index);
for (int a = gg.index+1; a < Elements.count(); ++a)
{
Index: scribus/plugins/import/oodraw/oodrawimp.cpp
===================================================================
--- scribus/plugins/import/oodraw/oodrawimp.cpp (revision 15070)
+++ scribus/plugins/import/oodraw/oodrawimp.cpp (revision 15071)
@@ -375,10 +375,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -654,10 +654,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -799,10 +799,10 @@
}
else
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
elements.append(neu);
for (int gr = 0; gr < cElements.count(); ++gr)
{
Index: scribus/plugins/import/drw/importdrw.cpp
===================================================================
--- scribus/plugins/import/drw/importdrw.cpp (revision 15070)
+++ scribus/plugins/import/drw/importdrw.cpp (revision 15071)
@@ -112,10 +112,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -318,10 +318,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/wpg/importwpg.cpp
===================================================================
--- scribus/plugins/import/wpg/importwpg.cpp (revision 15070)
+++ scribus/plugins/import/wpg/importwpg.cpp (revision 15071)
@@ -517,10 +517,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -712,10 +712,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/plugins/import/xfig/importxfig.cpp
===================================================================
--- scribus/plugins/import/xfig/importxfig.cpp (revision 15070)
+++ scribus/plugins/import/xfig/importxfig.cpp (revision 15071)
@@ -172,10 +172,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
@@ -439,10 +439,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/scpreview.cpp
===================================================================
--- scribus/scpreview.cpp (revision 15070)
+++ scribus/scpreview.cpp (revision 15071)
@@ -72,10 +72,10 @@
}
if (!isGroup)
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
uint lowestItem = 999999;
uint highestItem = 0;
for (int a = 0; a < Elements.count(); ++a)
Index: scribus/pslib.cpp
===================================================================
--- scribus/pslib.cpp (revision 15070)
+++ scribus/pslib.cpp (revision 15071)
@@ -1526,10 +1526,10 @@
uint docSelectionCount=Doc->m_Selection->count();
if ((!Art) && (docSelectionCount != 0))
{
- double minx = 99999.9;
- double miny = 99999.9;
- double maxx = -99999.9;
- double maxy = -99999.9;
+ double minx = 999999.9;
+ double miny = 999999.9;
+ double maxx = -999999.9;
+ double maxy = -999999.9;
for (uint ep = 0; ep < docSelectionCount; ++ep)
{
//PageItem* currItem = view->SelItem.at(ep);
More information about the scribus-commit
mailing list