--- parser3/src/classes/image.C 2020/12/07 23:18:40 1.178 +++ parser3/src/classes/image.C 2020/12/17 19:51:21 1.180 @@ -1,7 +1,7 @@ /** @file Parser: @b image parser class. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -26,7 +26,7 @@ #include "pa_table.h" #include "pa_charsets.h" -volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.178 2020/12/07 23:18:40 moko Exp $"; +volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.180 2020/12/17 19:51:21 moko Exp $"; // defines @@ -1175,11 +1175,12 @@ static void _replace(Request& r, MethodP gdImage::Point* all_p=0; size_t count=0; if(params.count() == 3){ - Table* table=params.as_table(2, "coordinates"); - count=table->count(); - all_p=new(PointerFreeGC) gdImage::Point[count]; - gdImage::Point* add_p=all_p; - table->for_each(add_point, &add_p); + if(Table* table=params.as_table(2, "coordinates")){ + count=table->count(); + all_p=new(PointerFreeGC) gdImage::Point[count]; + gdImage::Point* add_p=all_p; + table->for_each(add_point, &add_p); + } } else { int max_x=image.SX()-1; int max_y=image.SY()-1; @@ -1201,38 +1202,34 @@ static void _replace(Request& r, MethodP static void _polyline(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.Polygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r)), - false/*not closed*/); + if(Table* table=params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r)), false/*not closed*/); + } } static void _polygon(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=(Table*)params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.Polygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r))); + if(Table* table=(Table*)params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.Polygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r))); + } } static void _polybar(Request& r, MethodParams& params) { gdImage& image=GET_SELF(r, VImage).image(); - Table* table=(Table*)params.as_table(1, "coordinates"); - - gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; - gdImage::Point *add_p=all_p; - table->for_each(add_point, &add_p); - image.FilledPolygon(all_p, table->count(), - image.Color(params.as_int(0, "color must be int", r))); + if(Table* table=(Table*)params.as_table(1, "coordinates")){ + gdImage::Point* all_p=new(PointerFreeGC) gdImage::Point[table->count()]; + gdImage::Point *add_p=all_p; + table->for_each(add_point, &add_p); + image.FilledPolygon(all_p, table->count(), image.Color(params.as_int(0, "color must be int", r))); + } } // font