adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plumb some ownership around.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2025-08-06 03:38:48 -04:00
parent 1cd924f16f
commit eaee41750d
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dw/image.cc
View File

@ -31,8 +31,8 @@ namespace dw {
using namespace lout;
void ImageMapsList::ImageMap::draw (core::View *view,core::style::Style *style,
int x, int y)
void
ImageMapsList::ImageMap::draw( core::View *view, core::style::Style *style, int x, int y )
{
for( auto &shapeAndLink: shapesAndLinks )
{
@ -40,9 +40,11 @@ void ImageMapsList::ImageMap::draw (core::View *view,core::style::Style *style,
}
}
void ImageMapsList::ImageMap::add (core::Shape *shape, int link) {
void
ImageMapsList::ImageMap::add( std::unique_ptr< core::Shape > shape, int link )
{
auto shapeAndLink = std::make_unique< ShapeAndLink >();
shapeAndLink->shape = shape;
shapeAndLink->shape = std::move( shape );
shapeAndLink->link = link;
shapesAndLinks.push_back( std::move( shapeAndLink ) );
}
@ -93,9 +95,10 @@ void ImageMapsList::startNewMap (object::Object *key)
* "shape" is owned by the image map list, so a copy should be passed, when
* necessary.
*/
void ImageMapsList::addShapeToCurrentMap (core::Shape *shape, int link)
void
ImageMapsList::addShapeToCurrentMap( std::unique_ptr< core::Shape > shape, const int link )
{
currentMap->add (shape, link);
currentMap->add( std::move( shape ), link );
}
/**

8
dw/image.hh
View File

@ -27,10 +27,8 @@ private:
private:
class ShapeAndLink: public lout::object::Object {
public:
core::Shape *shape;
std::unique_ptr< core::Shape > shape;
int link;
~ShapeAndLink () { if (shape) delete shape; };
};
std::list< std::unique_ptr< ShapeAndLink > > shapesAndLinks;
@ -38,7 +36,7 @@ private:
public:
void draw (core::View *view, core::style::Style *style, int x, int y);
void add (core::Shape *shape, int link);
void add (std::unique_ptr< core::Shape > shape, int link);
void setDefaultLink (int link) { defaultLink = link; };
int link (int x, int y);
};
@ -52,7 +50,7 @@ public:
~ImageMapsList ();
void startNewMap (lout::object::Object *key);
void addShapeToCurrentMap (core::Shape *shape, int link);
void addShapeToCurrentMap( std::unique_ptr< core::Shape > shape, int link );
void setCurrentMapDefaultLink (int link);
void drawMap(lout::object::Object *key, core::View *view,
core::style::Style *style, int x, int y);

15
src/html.cc
View File

@ -2346,7 +2346,7 @@ static void
DilloUrl* url;
const char *attrbuf;
int link = -1;
Shape *shape = NULL;
std::unique_ptr< Shape > shape;
if (!(html->InFlags & IN_MAP)) {
BUG_MSG("<area> not inside <map>.");
@ -2376,7 +2376,7 @@ static void
if (coords->size() != 4)
BUG_MSG("<area> rectangle must have four coordinate values.");
if (coords->size() >= 4)
shape = new Rectangle(coords->get(0),
shape = std::make_unique< Rectangle >(coords->get(0),
coords->get(1),
coords->get(2) - coords->get(0),
coords->get(3) - coords->get(1));
@ -2384,21 +2384,22 @@ static void
if (coords->size() != 3)
BUG_MSG("<area> circle must have three coordinate values.");
if (coords->size() >= 3)
shape = new Circle(coords->get(0), coords->get(1),
shape = std::make_unique< Circle >(coords->get(0), coords->get(1),
coords->get(2));
} else if (type == POLYGON) {
Polygon *poly;
std::unique_ptr< Polygon > poly;
int i;
if (coords->size() % 2)
BUG_MSG("<area> polygon with odd number of coordinates.");
shape = poly = new Polygon();
poly = std::make_unique< Polygon >();
for (i = 0; i < (coords->size() / 2); i++)
poly->addPoint(coords->get(2*i), coords->get(2*i + 1));
shape= std::move( poly );
}
delete(coords);
}
}
if (shape != NULL || type == BACKGROUND) {
if (shape != nullptr || type == BACKGROUND) {
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "href"))) {
url = a_Html_url_new(html, attrbuf, NULL, 0).release();
dReturn_if_fail ( url != NULL );
@ -2408,7 +2409,7 @@ static void
if (type == BACKGROUND)
html->maps.setCurrentMapDefaultLink(link);
else
html->maps.addShapeToCurrentMap(shape, link);
html->maps.addShapeToCurrentMap(std::move( shape ), link);
}
}