← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ginkgocadx/trusty

« back to all changes in this revision

Viewing changes to src/cadxcore/main/gui/previewpanel/leafpanel.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2013-07-21 11:58:53 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: package-import@ubuntu.com-20130721115853-44e7n1xujqglu78e
Tags: 3.4.0.928.29+dfsg-1
* New upstream release [July 2013]
  + new B-D: "libjsoncpp-dev".
  + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
    "libjsoncpp-dev".
  + new patch "fix-wx.patch" to avoid FTBFS due to missing
    "-lwx_gtk2u_html-2.8".
* Removed unnecessary versioned Build-Depends.
* Removed obsolete lintian override.
* Reference get-orig-source implementation for orig.tar clean-up and
  DFSG-repackaging.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/gui/previewpanel/leafpanel.cpp
83
83
                void LeafPanel::SetImage(long , wxImage* pImage)
84
84
                {
85
85
                        if(pImage != NULL && pImage->IsOk()) {
 
86
                                wxBitmap overBitmap = m_pLeaf->GetOverlayBitmap();
 
87
                                if (overBitmap.Ok())
 
88
                                {
 
89
                                        wxImage& img = (*pImage);
 
90
                                        img.Paste(overBitmap.ConvertToImage(), 2,2);
 
91
                                }
86
92
                                wxBitmap bitmap(*pImage);
87
93
                                m_pThumbnail->SetBitmap(bitmap);
88
94
                                m_pThumbnail->Show();