koffice/krita/image

[Dmitry Kazakov]

On Sun, Nov 7, 2010 at 11:57 AM, Boudewijn Rempt <> wrote:

> On Sunday 07 November 2010, Dmitry Kazakov wrote:
> > SVN commit 1193814 by dkazakov:
> >
> > Deprecate KisImage::mergedImage() function
> >
> > It is intended to do a very strange thing (it doesn't guarantee
> > anything, because it can't even lock the image) and its functionality is
> > fully covered by other methods of KisImage. See a comment in the
> > header to get more info.
>
> Is it actually used anywhere at the moment? It's a survival from the good
> old 1.x days when life was simple and everything ran in the gui thread.
>

Yes, there are some places:
krita/plugins/extensions/dockers/defaultdockers/kis_imagerasteredcache.cc:
m_imageProjection = m_image->mergedImage();
krita/plugins/extensions/separate_channels/kis_channel_separator.cc:
src = image->mergedImage();
krita/plugins/paintops/libpaintop/kis_custom_brush_widget.cpp:
KisPaintDeviceSP dev = new KisPaintDevice(*m_image->mergedImage());
krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc:            dev =
currentImage()->mergedImage();
krita/plugins/tools/defaulttools/kis_tool_fill.cc:
fillPainter.fillPattern(startX, startY, currentImage()->mergedImage());
krita/plugins/tools/defaulttools/kis_tool_fill.cc:
fillPainter.fillColor(startX, startY, currentImage()->mergedImage());
krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc:
fillpainter.createFloodSelection(pos.x(), pos.y(),
currentImage()->mergedImage());
krita/ui/kis_custom_pattern.cc:    m_pattern = new
KisPattern(image->mergedImage().data(), 0, 0, image->width(),
image->height());

-- 
Dmitry Kazakov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/kimageshop/attachments/20101107/d4d8d8a5/attachment.htm