← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to src/osx/core/bitmap.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osx/core/bitmap.cpp
1321
1321
            UseAlpha() ;
1322
1322
 
1323
1323
        unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ;
1324
 
        register unsigned char* data = image.GetData();
 
1324
        unsigned char* data = image.GetData();
1325
1325
        if ( destinationstart != NULL && data != NULL )
1326
1326
        {
1327
1327
            const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
1822
1822
public:
1823
1823
    inline wxBundleResourceHandler()
1824
1824
    {
1825
 
    };
 
1825
    }
1826
1826
    
1827
1827
    virtual bool LoadFile(wxBitmap *bitmap,
1828
1828
                          const wxString& name,
1843
1843
        SetName(wxT("PNG resource"));
1844
1844
        SetExtension("PNG");
1845
1845
        SetType(wxBITMAP_TYPE_PNG_RESOURCE);
1846
 
    };
 
1846
    }
1847
1847
};
1848
1848
 
1849
1849
IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler)
1858
1858
        SetName(wxT("JPEG resource"));
1859
1859
        SetExtension("JPEG");
1860
1860
        SetType(wxBITMAP_TYPE_JPEG_RESOURCE);
1861
 
    };
 
1861
    }
1862
1862
};
1863
1863
 
1864
1864
IMPLEMENT_DYNAMIC_CLASS(wxJPEGResourceHandler, wxBundleResourceHandler)