summaryrefslogtreecommitdiffstats
path: root/src/livarot/Shape.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/livarot/Shape.cpp')
-rw-r--r--src/livarot/Shape.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index c29444a33..628e0fe9f 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -20,7 +20,12 @@
*/
Shape::Shape()
- : qrsData(NULL),
+ : nbQRas(0),
+ firstQRas(-1),
+ lastQRas(-1),
+ qrsData(NULL),
+ nbInc(0),
+ maxInc(0),
iData(NULL),
sTree(NULL),
sEvts(NULL),
@@ -130,7 +135,12 @@ Shape::MakeQuickRasterData (bool nVal)
if (_has_quick_raster_data == false)
{
_has_quick_raster_data = true;
- qrsData = (quick_raster_data*)realloc(qrsData, maxAr * sizeof(quick_raster_data));
+ quick_raster_data* new_qrsData = static_cast<quick_raster_data*>(realloc(qrsData, maxAr * sizeof(quick_raster_data)));
+ if (!new_qrsData) {
+ g_error("Not enough memory available for reallocating Shape::qrsData");
+ } else {
+ qrsData = new_qrsData;
+ }
}
}
else