[csw-maintainers] Error: Ambiguous "?:" expression

[Jake Goerzen]

I applied your patch (generator_private.hpp.diff) and continued
compiling, then ran into a problem in gui/widgets/image.cpp:

"gui/widgets/image.cpp", line 25: Error: get_image is not defined.
"gui/widgets/image.cpp", line 29: Error: Pointer type needed instead
of surface(*)().
"gui/widgets/image.cpp", line 29: Error: Pointer type needed instead
of surface(*)().
3 Error(s) detected.


The contents of file gui/widgets/image.cpp:

/* $Id: image.cpp 37939 2009-08-18 19:47:08Z mordante $ */
/*
   copyright (C) 2008 - 2009 by mark de wever <koraq at xs4all.nl>
   part of the battle for wesnoth project http://www.wesnoth.org/

   this program is free software; you can redistribute it and/or modify
   it under the terms of the gnu general public license version 2
   or at your option any later version.
   this program is distributed in the hope that it will be useful,
   but without any warranty.

   see the copying file for more details.
*/

#define GETTEXT_DOMAIN "wesnoth-lib"

#include "gui/widgets/image.hpp"

#include "../../image.hpp"

namespace gui2 {

tpoint timage::calculate_best_size() const
{
        surface image(get_image(image::locator(label())));

        tpoint result(0, 0);
        if(image) {
                result = tpoint(image->w, image->h);
        }

        DBG_G_L << "timage " << __func__ << ":"
                << " empty image " << !image
                << " result " << result
                << ".\n";
        return result;
}

const std::string& timage::get_control_type() const
{
        static const std::string type = "image";
        return type;
}

} // namespace gui2