AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused code and added TODO comment

Browse Source
This commit is contained in:
JulianSmart 2017-05-24 17:39:54 +01:00
parent aa56419ea8
commit 72298d7d04
1 changed files with 5 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/generic/dirctrlg.cpp
View File

@ -1536,117 +1536,6 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
return m_smallImageList; return m_smallImageList;
} }
// This function is currently not unused anymore
#if 0
#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB)
// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
// one icon and we won't resize it
static wxBitmap CreateAntialiasedBitmap(const wxImage& img, const wxSize& sz)
{
const unsigned int size = sz.x;
wxImage smallimg (size, size);
unsigned char *p1, *p2, *ps;
unsigned char mr = img.GetMaskRed(),
mg = img.GetMaskGreen(),
mb = img.GetMaskBlue();
unsigned x, y;
unsigned sr, sg, sb, smask;
p1 = img.GetData(), p2 = img.GetData() + 3 * size*2, ps = smallimg.GetData();
smallimg.SetMaskColour(mr, mr, mr);
for (y = 0; y < size; y++)
{
for (x = 0; x < size; x++)
{
sr = sg = sb = smask = 0;
if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
sr += p1[0], sg += p1[1], sb += p1[2];
else smask++;
p1 += 3;
if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
sr += p1[0], sg += p1[1], sb += p1[2];
else smask++;
p1 += 3;
if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
sr += p2[0], sg += p2[1], sb += p2[2];
else smask++;
p2 += 3;
if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
sr += p2[0], sg += p2[1], sb += p2[2];
else smask++;
p2 += 3;
if (smask > 2)
ps[0] = ps[1] = ps[2] = mr;
else
{
ps[0] = (unsigned char)(sr >> 2);
ps[1] = (unsigned char)(sg >> 2);
ps[2] = (unsigned char)(sb >> 2);
}
ps += 3;
}
p1 += size*2 * 3, p2 += size*2 * 3;
}
return wxBitmap(smallimg);
}
#endif
// #if 0
// This function is currently not unused anymore
#if 0
// finds empty borders and return non-empty area of image:
static wxImage CutEmptyBorders(const wxImage& img)
{
unsigned char mr = img.GetMaskRed(),
mg = img.GetMaskGreen(),
mb = img.GetMaskBlue();
unsigned char *dt = img.GetData(), *dttmp;
unsigned w = img.GetWidth(), h = img.GetHeight();
unsigned top, bottom, left, right, i;
bool empt;
#define MK_DTTMP(x,y) dttmp = dt + ((x + y * w) * 3)
#define NOEMPTY_PIX(empt) if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = false; break;}
for (empt = true, top = 0; empt && top < h; top++)
{
MK_DTTMP(0, top);
for (i = 0; i < w; i++, dttmp+=3)
NOEMPTY_PIX(empt)
}
for (empt = true, bottom = h-1; empt && bottom > top; bottom--)
{
MK_DTTMP(0, bottom);
for (i = 0; i < w; i++, dttmp+=3)
NOEMPTY_PIX(empt)
}
for (empt = true, left = 0; empt && left < w; left++)
{
MK_DTTMP(left, 0);
for (i = 0; i < h; i++, dttmp+=3*w)
NOEMPTY_PIX(empt)
}
for (empt = true, right = w-1; empt && right > left; right--)
{
MK_DTTMP(right, 0);
for (i = 0; i < h; i++, dttmp+=3*w)
NOEMPTY_PIX(empt)
}
top--, left--, bottom++, right++;
return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
}
#endif // #if 0
#endif // wxUSE_MIMETYPE
int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
{ {
if (!m_smallImageList) if (!m_smallImageList)
@ -1711,6 +1600,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
wxBitmap bmp2; wxBitmap bmp2;
if ((img.GetWidth() != size) || (img.GetHeight() != size)) if ((img.GetWidth() != size) || (img.GetHeight() != size))
{ {
// TODO: replace with public API that gets the bitmap scale.
// But this function may be called from code that doesn't pass a window,
// so we will need to be able to get the scaling factor of the current
// display, somehow. We could use wxTheApp->GetTopWindow() but sometimes
// this won't be available.
#if defined(__WXOSX_COCOA__) #if defined(__WXOSX_COCOA__)
if (wxOSXGetMainScreenContentScaleFactor() > 1.0) if (wxOSXGetMainScreenContentScaleFactor() > 1.0)
{ {