Author: craig
Date: Fri Dec 29 22:36:25 2017
New Revision: 22302
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22302
Log:
Fix Coverity 1350710/1350712
Modified:
trunk/Scribus/scribus/guidemanagercore.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
Modified: trunk/Scribus/scribus/guidemanagercore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22302&path=/trunk/Scribus/scribus/guidemanagercore.cpp
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.cpp (original)
+++ trunk/Scribus/scribus/guidemanagercore.cpp Fri Dec 29 22:36:25 2017
@@ -250,9 +250,8 @@
if (m_horizontalAutoCount == 0)
return guides;
++value;
-
+ double newPageHeight = page->height();
double offset = 0.0;
- double newPageHeight = page->height();
if (m_horizontalAutoRefer == 1)
{
newPageHeight = newPageHeight - page->Margins.top() -
page->Margins.bottom();
@@ -298,9 +297,8 @@
if (m_verticalAutoCount == 0)
return guides;
++value;
-
+ double newPageWidth = page->width();
double offset = 0.0;
- double newPageWidth = page->width();
if (m_verticalAutoRefer == 1)
{
newPageWidth = newPageWidth - page->Margins.left() -
page->Margins.right();
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22302&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp Fri Dec
29 22:36:25 2017
@@ -11,7 +11,9 @@
#include "scimgdataloader_ora.h"
#include "util_formats.h"
-ScImgDataLoader_ORA::ScImgDataLoader_ORA(void) : ScImgDataLoader()
+ScImgDataLoader_ORA::ScImgDataLoader_ORA(void) : ScImgDataLoader(),
+ m_inSubLayer(0),
+ m_layerCount(0)
{
initSupportedFormatList();
}
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22302&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp Fri Dec
29 22:36:25 2017
@@ -42,7 +42,22 @@
#include "util_formats.h"
#include "util_math.h"
-ScImgDataLoader_PICT::ScImgDataLoader_PICT(void) : ScImgDataLoader()
+ScImgDataLoader_PICT::ScImgDataLoader_PICT(void) : ScImgDataLoader(),
+ m_baseX(0),
+ m_baseY(0),
+ m_docWidth(0),
+ m_docHeight(0),
+ m_resX(0.0),
+ m_resY(0.0),
+ m_LineW(0.0),
+ m_patternMode(false),
+ m_currentTextSize(0),
+ m_currentFontID(0),
+ m_currentFontStyle(0),
+ m_postscriptMode(false),
+ m_textIsPostScript(false),
+ m_pctVersion(0),
+ m_skipOpcode(false)
{
initSupportedFormatList();
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
