← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/cadxcore/commands/thumbnailscommand.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/commands/thumbnailscommand.cpp
64
64
 
65
65
#define IDC_GENERAR_THUMBNAILS       81
66
66
#define IDC_CARGA       91
67
 
#define SIZE_THUMBNAILS 96
 
67
#define SIZE_THUMBNAILS 76
68
68
 
69
69
namespace GADAPI {
70
70
        class ThumbnailsCommandParams: public GNC::GCS::IComandoParams {
118
118
                        m_Error = false;
119
119
                        return;
120
120
                }
 
121
                //if is wado linked...
 
122
                if (m_pThumbParams->m_fileModel.location == GNC::GCS::IHistoryController::TL_WadoLinked) {
 
123
                        wxBitmap bmp = GinkgoResourcesManager::History::GetIcoWadoLinkedPreview();
 
124
                        m_pThumbParams->m_wxImg = new wxImage();
 
125
                        (*m_pThumbParams->m_wxImg) = bmp.ConvertToImage();
 
126
                        m_Error = false;
 
127
                        return;
 
128
                }
121
129
                //comprobar si el thumbnail ya estaba generado
122
130
                m_pThumbParams->m_wxImg = GetImageFromBD();
123
131
                if(m_pThumbParams->m_wxImg != NULL) {