b057ac075b
When explicitly requesting saving as a palettised image but then later on that turns out to not be possible (or desired) the image would be marked as PNG_COLOR_TYPE_GRAY or PNG_COLOR_TYPE_GRAY_ALPHA. Simply set the colour type to RGB if this occurs also updated the unit test to catch this case. This is similar to the fix in r66590 but that one was related to wxUSE_PALETTE == 0 cases. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1100 lines
32 KiB
C++
1100 lines
32 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/image/image.cpp
|
|
// Purpose: Test wxImage
|
|
// Author: Francesco Montorsi
|
|
// Created: 2009-05-31
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 2009 Francesco Montorsi
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "testprec.h"
|
|
|
|
#if wxUSE_IMAGE
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#ifndef WX_PRECOMP
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "wx/image.h"
|
|
#include "wx/palette.h"
|
|
#include "wx/url.h"
|
|
#include "wx/log.h"
|
|
#include "wx/mstream.h"
|
|
#include "wx/zstream.h"
|
|
#include "wx/wfstream.h"
|
|
|
|
struct testData {
|
|
const char* file;
|
|
wxBitmapType type;
|
|
unsigned bitDepth;
|
|
} g_testfiles[] =
|
|
{
|
|
{ "horse.ico", wxBITMAP_TYPE_ICO, 4 },
|
|
{ "horse.xpm", wxBITMAP_TYPE_XPM, 8 },
|
|
{ "horse.png", wxBITMAP_TYPE_PNG, 24 },
|
|
{ "horse.ani", wxBITMAP_TYPE_ANI, 24 },
|
|
{ "horse.bmp", wxBITMAP_TYPE_BMP, 8 },
|
|
{ "horse.cur", wxBITMAP_TYPE_CUR, 1 },
|
|
{ "horse.gif", wxBITMAP_TYPE_GIF, 8 },
|
|
{ "horse.jpg", wxBITMAP_TYPE_JPEG, 24 },
|
|
{ "horse.pcx", wxBITMAP_TYPE_PCX, 8 },
|
|
{ "horse.pnm", wxBITMAP_TYPE_PNM, 24 },
|
|
{ "horse.tga", wxBITMAP_TYPE_TGA, 8 },
|
|
{ "horse.tif", wxBITMAP_TYPE_TIF, 8 }
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// test class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class ImageTestCase : public CppUnit::TestCase
|
|
{
|
|
public:
|
|
ImageTestCase();
|
|
~ImageTestCase();
|
|
|
|
private:
|
|
CPPUNIT_TEST_SUITE( ImageTestCase );
|
|
CPPUNIT_TEST( LoadFromSocketStream );
|
|
CPPUNIT_TEST( LoadFromZipStream );
|
|
CPPUNIT_TEST( LoadFromFile );
|
|
CPPUNIT_TEST( SizeImage );
|
|
CPPUNIT_TEST( CompareLoadedImage );
|
|
CPPUNIT_TEST( CompareSavedImage );
|
|
CPPUNIT_TEST_SUITE_END();
|
|
|
|
void LoadFromSocketStream();
|
|
void LoadFromZipStream();
|
|
void LoadFromFile();
|
|
void SizeImage();
|
|
void CompareLoadedImage();
|
|
void CompareSavedImage();
|
|
|
|
DECLARE_NO_COPY_CLASS(ImageTestCase)
|
|
};
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( ImageTestCase );
|
|
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ImageTestCase, "ImageTestCase" );
|
|
|
|
ImageTestCase::ImageTestCase()
|
|
{
|
|
wxSocketBase::Initialize();
|
|
|
|
// the formats we're going to test:
|
|
wxImage::AddHandler(new wxICOHandler);
|
|
wxImage::AddHandler(new wxXPMHandler);
|
|
wxImage::AddHandler(new wxPNGHandler);
|
|
wxImage::AddHandler(new wxANIHandler);
|
|
wxImage::AddHandler(new wxBMPHandler);
|
|
wxImage::AddHandler(new wxCURHandler);
|
|
wxImage::AddHandler(new wxGIFHandler);
|
|
wxImage::AddHandler(new wxJPEGHandler);
|
|
wxImage::AddHandler(new wxPCXHandler);
|
|
wxImage::AddHandler(new wxPNMHandler);
|
|
wxImage::AddHandler(new wxTGAHandler);
|
|
wxImage::AddHandler(new wxTIFFHandler);
|
|
}
|
|
|
|
ImageTestCase::~ImageTestCase()
|
|
{
|
|
wxSocketBase::Shutdown();
|
|
}
|
|
|
|
void ImageTestCase::LoadFromFile()
|
|
{
|
|
wxImage img;
|
|
for (unsigned int i=0; i<WXSIZEOF(g_testfiles); i++)
|
|
CPPUNIT_ASSERT(img.LoadFile(g_testfiles[i].file));
|
|
}
|
|
|
|
void ImageTestCase::LoadFromSocketStream()
|
|
{
|
|
if (!IsNetworkAvailable()) // implemented in test.cpp
|
|
{
|
|
wxLogWarning("No network connectivity; skipping the "
|
|
"ImageTestCase::LoadFromSocketStream test unit.");
|
|
return;
|
|
}
|
|
|
|
struct {
|
|
const char* url;
|
|
wxBitmapType type;
|
|
} testData[] =
|
|
{
|
|
{ "http://www.wxwidgets.org/logo9.jpg", wxBITMAP_TYPE_JPEG },
|
|
{ "http://www.wxwidgets.org/favicon.ico", wxBITMAP_TYPE_ICO }
|
|
};
|
|
|
|
for (unsigned int i=0; i<WXSIZEOF(testData); i++)
|
|
{
|
|
wxURL url(testData[i].url);
|
|
WX_ASSERT_EQUAL_MESSAGE
|
|
(
|
|
("Constructing URL \"%s\" failed.", testData[i].url),
|
|
wxURL_NOERR,
|
|
url.GetError()
|
|
);
|
|
|
|
wxInputStream *in_stream = url.GetInputStream();
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Opening URL \"%s\" failed.", testData[i].url),
|
|
in_stream && in_stream->IsOk()
|
|
);
|
|
|
|
wxImage img;
|
|
|
|
// NOTE: it's important to inform wxImage about the type of the image being
|
|
// loaded otherwise it will try to autodetect the format, but that
|
|
// requires a seekable stream!
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Loading image from \"%s\" failed.", testData[i].url),
|
|
img.LoadFile(*in_stream, testData[i].type)
|
|
);
|
|
|
|
delete in_stream;
|
|
}
|
|
}
|
|
|
|
void ImageTestCase::LoadFromZipStream()
|
|
{
|
|
for (unsigned int i=0; i<WXSIZEOF(g_testfiles); i++)
|
|
{
|
|
switch (g_testfiles[i].type)
|
|
{
|
|
case wxBITMAP_TYPE_XPM:
|
|
case wxBITMAP_TYPE_GIF:
|
|
case wxBITMAP_TYPE_PCX:
|
|
case wxBITMAP_TYPE_TGA:
|
|
case wxBITMAP_TYPE_TIF:
|
|
continue; // skip testing those wxImageHandlers which cannot
|
|
// load data from non-seekable streams
|
|
|
|
default:
|
|
; // proceed
|
|
}
|
|
|
|
// compress the test file on the fly:
|
|
wxMemoryOutputStream memOut;
|
|
{
|
|
wxFileInputStream file(g_testfiles[i].file);
|
|
CPPUNIT_ASSERT(file.IsOk());
|
|
|
|
wxZlibOutputStream compressFilter(memOut, 5, wxZLIB_GZIP);
|
|
CPPUNIT_ASSERT(compressFilter.IsOk());
|
|
|
|
file.Read(compressFilter);
|
|
CPPUNIT_ASSERT(file.GetLastError() == wxSTREAM_EOF);
|
|
}
|
|
|
|
// now fetch the compressed memory to wxImage, decompressing it on the fly; this
|
|
// allows us to test loading images from non-seekable streams other than socket streams
|
|
wxMemoryInputStream memIn(memOut);
|
|
CPPUNIT_ASSERT(memIn.IsOk());
|
|
wxZlibInputStream decompressFilter(memIn, wxZLIB_GZIP);
|
|
CPPUNIT_ASSERT(decompressFilter.IsOk());
|
|
|
|
wxImage img;
|
|
|
|
// NOTE: it's important to inform wxImage about the type of the image being
|
|
// loaded otherwise it will try to autodetect the format, but that
|
|
// requires a seekable stream!
|
|
WX_ASSERT_MESSAGE(("Could not load file type '%d' after it was zipped", g_testfiles[i].type),
|
|
img.LoadFile(decompressFilter, g_testfiles[i].type));
|
|
}
|
|
}
|
|
|
|
void ImageTestCase::SizeImage()
|
|
{
|
|
// Test the wxImage::Size() function which takes a rectangle from source and
|
|
// places it in a new image at a given position. This test checks, if the
|
|
// correct areas are chosen, and clipping is done correctly.
|
|
|
|
// our test image:
|
|
static const char * xpm_orig[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....",
|
|
" ++++@@@@.",
|
|
" +... @.",
|
|
" +.@@++ @.",
|
|
" +.@ .+ @.",
|
|
".@ +. @.+ ",
|
|
".@ ++@@.+ ",
|
|
".@ ...+ ",
|
|
".@@@@++++ ",
|
|
"..... "
|
|
};
|
|
// the expected results for all tests:
|
|
static const char * xpm_l_t[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"... @.BB",
|
|
".@@++ @.BB",
|
|
".@ .+ @.BB",
|
|
" +. @.+ BB",
|
|
" ++@@.+ BB",
|
|
" ...+ BB",
|
|
"@@@++++ BB",
|
|
"... BB",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB"
|
|
};
|
|
static const char * xpm_t[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" +... @.",
|
|
" +.@@++ @.",
|
|
" +.@ .+ @.",
|
|
".@ +. @.+ ",
|
|
".@ ++@@.+ ",
|
|
".@ ...+ ",
|
|
".@@@@++++ ",
|
|
"..... ",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB"
|
|
};
|
|
static const char * xpm_r_t[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB +... ",
|
|
"BB +.@@++ ",
|
|
"BB +.@ .+ ",
|
|
"BB.@ +. @.",
|
|
"BB.@ ++@@.",
|
|
"BB.@ ...",
|
|
"BB.@@@@+++",
|
|
"BB..... ",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB"
|
|
};
|
|
static const char * xpm_l[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....BB",
|
|
"+++@@@@.BB",
|
|
"... @.BB",
|
|
".@@++ @.BB",
|
|
".@ .+ @.BB",
|
|
" +. @.+ BB",
|
|
" ++@@.+ BB",
|
|
" ...+ BB",
|
|
"@@@++++ BB",
|
|
"... BB"
|
|
};
|
|
static const char * xpm_r[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB ...",
|
|
"BB ++++@@@",
|
|
"BB +... ",
|
|
"BB +.@@++ ",
|
|
"BB +.@ .+ ",
|
|
"BB.@ +. @.",
|
|
"BB.@ ++@@.",
|
|
"BB.@ ...",
|
|
"BB.@@@@+++",
|
|
"BB..... "
|
|
};
|
|
static const char * xpm_l_b[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB",
|
|
" .....BB",
|
|
"+++@@@@.BB",
|
|
"... @.BB",
|
|
".@@++ @.BB",
|
|
".@ .+ @.BB",
|
|
" +. @.+ BB",
|
|
" ++@@.+ BB",
|
|
" ...+ BB"
|
|
};
|
|
static const char * xpm_b[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB",
|
|
" .....",
|
|
" ++++@@@@.",
|
|
" +... @.",
|
|
" +.@@++ @.",
|
|
" +.@ .+ @.",
|
|
".@ +. @.+ ",
|
|
".@ ++@@.+ ",
|
|
".@ ...+ "
|
|
};
|
|
static const char * xpm_r_b[] = {
|
|
"10 10 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBB",
|
|
"BBBBBBBBBB",
|
|
"BB ...",
|
|
"BB ++++@@@",
|
|
"BB +... ",
|
|
"BB +.@@++ ",
|
|
"BB +.@ .+ ",
|
|
"BB.@ +. @.",
|
|
"BB.@ ++@@.",
|
|
"BB.@ ..."
|
|
};
|
|
static const char * xpm_sm[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....",
|
|
" ++++@@@",
|
|
" +... ",
|
|
" +.@@++ ",
|
|
" +.@ .+ ",
|
|
".@ +. @.",
|
|
".@ ++@@.",
|
|
".@ ..."
|
|
};
|
|
static const char * xpm_gt[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....BB",
|
|
" ++++@@@@.BB",
|
|
" +... @.BB",
|
|
" +.@@++ @.BB",
|
|
" +.@ .+ @.BB",
|
|
".@ +. @.+ BB",
|
|
".@ ++@@.+ BB",
|
|
".@ ...+ BB",
|
|
".@@@@++++ BB",
|
|
"..... BB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_l_t[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"... @.BBBB",
|
|
".@@++ @.BBBB",
|
|
".@ .+ @.BBBB",
|
|
" +. @.+ BBBB",
|
|
" ++@@.+ BBBB",
|
|
" ...+ BBBB",
|
|
"@@@++++ BBBB",
|
|
"... BBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_l[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....BBBB",
|
|
"+++@@@@.BBBB",
|
|
"... @.BBBB",
|
|
".@@++ @.BBBB",
|
|
".@ .+ @.BBBB",
|
|
" +. @.+ BBBB",
|
|
" ++@@.+ BBBB",
|
|
" ...+ BBBB",
|
|
"@@@++++ BBBB",
|
|
"... BBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_l_b[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
" .....BBBB",
|
|
"+++@@@@.BBBB",
|
|
"... @.BBBB",
|
|
".@@++ @.BBBB",
|
|
".@ .+ @.BBBB",
|
|
" +. @.+ BBBB",
|
|
" ++@@.+ BBBB",
|
|
" ...+ BBBB",
|
|
"@@@++++ BBBB",
|
|
"... BBBB"
|
|
};
|
|
static const char * xpm_gt_l_bb[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
" .....BBBB",
|
|
"+++@@@@.BBBB",
|
|
"... @.BBBB",
|
|
".@@++ @.BBBB",
|
|
".@ .+ @.BBBB",
|
|
" +. @.+ BBBB",
|
|
" ++@@.+ BBBB",
|
|
" ...+ BBBB"
|
|
};
|
|
static const char * xpm_gt_t[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" +... @.BB",
|
|
" +.@@++ @.BB",
|
|
" +.@ .+ @.BB",
|
|
".@ +. @.+ BB",
|
|
".@ ++@@.+ BB",
|
|
".@ ...+ BB",
|
|
".@@@@++++ BB",
|
|
"..... BB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_b[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
" .....BB",
|
|
" ++++@@@@.BB",
|
|
" +... @.BB",
|
|
" +.@@++ @.BB",
|
|
" +.@ .+ @.BB",
|
|
".@ +. @.+ BB",
|
|
".@ ++@@.+ BB",
|
|
".@ ...+ BB",
|
|
".@@@@++++ BB",
|
|
"..... BB"
|
|
};
|
|
static const char * xpm_gt_bb[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
" .....BB",
|
|
" ++++@@@@.BB",
|
|
" +... @.BB",
|
|
" +.@@++ @.BB",
|
|
" +.@ .+ @.BB",
|
|
".@ +. @.+ BB",
|
|
".@ ++@@.+ BB",
|
|
".@ ...+ BB"
|
|
};
|
|
static const char * xpm_gt_r_t[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB +... @.",
|
|
"BB +.@@++ @.",
|
|
"BB +.@ .+ @.",
|
|
"BB.@ +. @.+ ",
|
|
"BB.@ ++@@.+ ",
|
|
"BB.@ ...+ ",
|
|
"BB.@@@@++++ ",
|
|
"BB..... ",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_r[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB .....",
|
|
"BB ++++@@@@.",
|
|
"BB +... @.",
|
|
"BB +.@@++ @.",
|
|
"BB +.@ .+ @.",
|
|
"BB.@ +. @.+ ",
|
|
"BB.@ ++@@.+ ",
|
|
"BB.@ ...+ ",
|
|
"BB.@@@@++++ ",
|
|
"BB..... ",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_r_b[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BB .....",
|
|
"BB ++++@@@@.",
|
|
"BB +... @.",
|
|
"BB +.@@++ @.",
|
|
"BB +.@ .+ @.",
|
|
"BB.@ +. @.+ ",
|
|
"BB.@ ++@@.+ ",
|
|
"BB.@ ...+ ",
|
|
"BB.@@@@++++ ",
|
|
"BB..... "
|
|
};
|
|
static const char * xpm_gt_r_bb[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BB .....",
|
|
"BB ++++@@@@.",
|
|
"BB +... @.",
|
|
"BB +.@@++ @.",
|
|
"BB +.@ .+ @.",
|
|
"BB.@ +. @.+ ",
|
|
"BB.@ ++@@.+ ",
|
|
"BB.@ ...+ "
|
|
};
|
|
static const char * xpm_gt_rr_t[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBB +... ",
|
|
"BBBB +.@@++ ",
|
|
"BBBB +.@ .+ ",
|
|
"BBBB.@ +. @.",
|
|
"BBBB.@ ++@@.",
|
|
"BBBB.@ ...",
|
|
"BBBB.@@@@+++",
|
|
"BBBB..... ",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_rr[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBB ...",
|
|
"BBBB ++++@@@",
|
|
"BBBB +... ",
|
|
"BBBB +.@@++ ",
|
|
"BBBB +.@ .+ ",
|
|
"BBBB.@ +. @.",
|
|
"BBBB.@ ++@@.",
|
|
"BBBB.@ ...",
|
|
"BBBB.@@@@+++",
|
|
"BBBB..... ",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB"
|
|
};
|
|
static const char * xpm_gt_rr_b[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBB ...",
|
|
"BBBB ++++@@@",
|
|
"BBBB +... ",
|
|
"BBBB +.@@++ ",
|
|
"BBBB +.@ .+ ",
|
|
"BBBB.@ +. @.",
|
|
"BBBB.@ ++@@.",
|
|
"BBBB.@ ...",
|
|
"BBBB.@@@@+++",
|
|
"BBBB..... "
|
|
};
|
|
static const char * xpm_gt_rr_bb[] = {
|
|
"12 12 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBBBBBBBBBB",
|
|
"BBBB ...",
|
|
"BBBB ++++@@@",
|
|
"BBBB +... ",
|
|
"BBBB +.@@++ ",
|
|
"BBBB +.@ .+ ",
|
|
"BBBB.@ +. @.",
|
|
"BBBB.@ ++@@.",
|
|
"BBBB.@ ..."
|
|
};
|
|
static const char * xpm_sm_ll_tt[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .+ @.BB",
|
|
". @.+ BB",
|
|
"+@@.+ BB",
|
|
" ...+ BB",
|
|
"@++++ BB",
|
|
". BB",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB"
|
|
};
|
|
static const char * xpm_sm_ll_t[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
". @.BB",
|
|
"@++ @.BB",
|
|
" .+ @.BB",
|
|
". @.+ BB",
|
|
"+@@.+ BB",
|
|
" ...+ BB",
|
|
"@++++ BB",
|
|
". BB"
|
|
};
|
|
static const char * xpm_sm_ll[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....BB",
|
|
"+@@@@.BB",
|
|
". @.BB",
|
|
"@++ @.BB",
|
|
" .+ @.BB",
|
|
". @.+ BB",
|
|
"+@@.+ BB",
|
|
" ...+ BB"
|
|
};
|
|
static const char * xpm_sm_ll_b[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB",
|
|
" .....BB",
|
|
"+@@@@.BB",
|
|
". @.BB",
|
|
"@++ @.BB",
|
|
" .+ @.BB",
|
|
". @.+ BB"
|
|
};
|
|
static const char * xpm_sm_l_tt[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
".@ .+ @.",
|
|
" +. @.+ ",
|
|
" ++@@.+ ",
|
|
" ...+ ",
|
|
"@@@++++ ",
|
|
"... ",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB"
|
|
};
|
|
static const char * xpm_sm_l_t[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"... @.",
|
|
".@@++ @.",
|
|
".@ .+ @.",
|
|
" +. @.+ ",
|
|
" ++@@.+ ",
|
|
" ...+ ",
|
|
"@@@++++ ",
|
|
"... "
|
|
};
|
|
static const char * xpm_sm_l[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" .....",
|
|
"+++@@@@.",
|
|
"... @.",
|
|
".@@++ @.",
|
|
".@ .+ @.",
|
|
" +. @.+ ",
|
|
" ++@@.+ ",
|
|
" ...+ "
|
|
};
|
|
static const char * xpm_sm_l_b[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB",
|
|
" .....",
|
|
"+++@@@@.",
|
|
"... @.",
|
|
".@@++ @.",
|
|
".@ .+ @.",
|
|
" +. @.+ "
|
|
};
|
|
static const char * xpm_sm_tt[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" +.@ .+ ",
|
|
".@ +. @.",
|
|
".@ ++@@.",
|
|
".@ ...",
|
|
".@@@@+++",
|
|
"..... ",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB"
|
|
};
|
|
static const char * xpm_sm_t[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
" +... ",
|
|
" +.@@++ ",
|
|
" +.@ .+ ",
|
|
".@ +. @.",
|
|
".@ ++@@.",
|
|
".@ ...",
|
|
".@@@@+++",
|
|
"..... "
|
|
};
|
|
static const char * xpm_sm_b[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB",
|
|
" ...",
|
|
" ++++@@@",
|
|
" +... ",
|
|
" +.@@++ ",
|
|
" +.@ .+ ",
|
|
".@ +. @."
|
|
};
|
|
static const char * xpm_sm_r_tt[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB +.@ .",
|
|
"BB.@ +. ",
|
|
"BB.@ ++@",
|
|
"BB.@ .",
|
|
"BB.@@@@+",
|
|
"BB..... ",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB"
|
|
};
|
|
static const char * xpm_sm_r_t[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB +... ",
|
|
"BB +.@@+",
|
|
"BB +.@ .",
|
|
"BB.@ +. ",
|
|
"BB.@ ++@",
|
|
"BB.@ .",
|
|
"BB.@@@@+",
|
|
"BB..... "
|
|
};
|
|
static const char * xpm_sm_r[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BB .",
|
|
"BB ++++@",
|
|
"BB +... ",
|
|
"BB +.@@+",
|
|
"BB +.@ .",
|
|
"BB.@ +. ",
|
|
"BB.@ ++@",
|
|
"BB.@ ."
|
|
};
|
|
static const char * xpm_sm_r_b[] = {
|
|
"8 8 5 1", "B c Black", " c #00ff00", ". c #0000ff", "+ c #7f7f7f", "@ c #FF0000",
|
|
"BBBBBBBB",
|
|
"BBBBBBBB",
|
|
"BB .",
|
|
"BB ++++@",
|
|
"BB +... ",
|
|
"BB +.@@+",
|
|
"BB +.@ .",
|
|
"BB.@ +. "
|
|
};
|
|
|
|
// this table defines all tests
|
|
struct SizeTestData
|
|
{
|
|
int w, h, dx, dy; // first parameters for Size()
|
|
const char **ref_xpm; // expected result
|
|
} sizeTestData[] =
|
|
{
|
|
{ 10, 10, 0, 0, xpm_orig}, // same size, same position
|
|
{ 12, 12, 0, 0, xpm_gt}, // target larger, same position
|
|
{ 8, 8, 0, 0, xpm_sm}, // target smaller, same position
|
|
{ 10, 10, -2, -2, xpm_l_t}, // same size, move left up
|
|
{ 10, 10, -2, 0, xpm_l}, // same size, move left
|
|
{ 10, 10, -2, 2, xpm_l_b}, // same size, move left down
|
|
{ 10, 10, 0, -2, xpm_t}, // same size, move up
|
|
{ 10, 10, 0, 2, xpm_b}, // same size, move down
|
|
{ 10, 10, 2, -2, xpm_r_t}, // same size, move right up
|
|
{ 10, 10, 2, 0, xpm_r}, // same size, move right
|
|
{ 10, 10, 2, 2, xpm_r_b}, // same size, move right down
|
|
{ 12, 12, -2, -2, xpm_gt_l_t}, // target larger, move left up
|
|
{ 12, 12, -2, 0, xpm_gt_l}, // target larger, move left
|
|
{ 12, 12, -2, 2, xpm_gt_l_b}, // target larger, move left down
|
|
{ 12, 12, -2, 4, xpm_gt_l_bb}, // target larger, move left down
|
|
{ 12, 12, 0, -2, xpm_gt_t}, // target larger, move up
|
|
{ 12, 12, 0, 2, xpm_gt_b}, // target larger, move down
|
|
{ 12, 12, 0, 4, xpm_gt_bb}, // target larger, move down
|
|
{ 12, 12, 2, -2, xpm_gt_r_t}, // target larger, move right up
|
|
{ 12, 12, 2, 0, xpm_gt_r}, // target larger, move right
|
|
{ 12, 12, 2, 2, xpm_gt_r_b}, // target larger, move right down
|
|
{ 12, 12, 2, 4, xpm_gt_r_bb}, // target larger, move right down
|
|
{ 12, 12, 4, -2, xpm_gt_rr_t}, // target larger, move right up
|
|
{ 12, 12, 4, 0, xpm_gt_rr}, // target larger, move right
|
|
{ 12, 12, 4, 2, xpm_gt_rr_b}, // target larger, move right down
|
|
{ 12, 12, 4, 4, xpm_gt_rr_bb}, // target larger, move right down
|
|
{ 8, 8, -4, -4, xpm_sm_ll_tt}, // target smaller, move left up
|
|
{ 8, 8, -4, -2, xpm_sm_ll_t}, // target smaller, move left up
|
|
{ 8, 8, -4, 0, xpm_sm_ll}, // target smaller, move left
|
|
{ 8, 8, -4, 2, xpm_sm_ll_b}, // target smaller, move left down
|
|
{ 8, 8, -2, -4, xpm_sm_l_tt}, // target smaller, move left up
|
|
{ 8, 8, -2, -2, xpm_sm_l_t}, // target smaller, move left up
|
|
{ 8, 8, -2, 0, xpm_sm_l}, // target smaller, move left
|
|
{ 8, 8, -2, 2, xpm_sm_l_b}, // target smaller, move left down
|
|
{ 8, 8, 0, -4, xpm_sm_tt}, // target smaller, move up
|
|
{ 8, 8, 0, -2, xpm_sm_t}, // target smaller, move up
|
|
{ 8, 8, 0, 2, xpm_sm_b}, // target smaller, move down
|
|
{ 8, 8, 2, -4, xpm_sm_r_tt}, // target smaller, move right up
|
|
{ 8, 8, 2, -2, xpm_sm_r_t}, // target smaller, move right up
|
|
{ 8, 8, 2, 0, xpm_sm_r}, // target smaller, move right
|
|
{ 8, 8, 2, 2, xpm_sm_r_b}, // target smaller, move right down
|
|
};
|
|
|
|
const wxImage src_img(xpm_orig);
|
|
for ( unsigned i = 0; i < WXSIZEOF(sizeTestData); i++ )
|
|
{
|
|
SizeTestData& st = sizeTestData[i];
|
|
wxImage
|
|
actual(src_img.Size(wxSize(st.w, st.h), wxPoint(st.dx, st.dy), 0, 0, 0)),
|
|
expected(st.ref_xpm);
|
|
|
|
// to check results with an image viewer uncomment this:
|
|
//actual.SaveFile(wxString::Format("imagetest-%02d-actual.png", i), wxBITMAP_TYPE_PNG);
|
|
//expected.SaveFile(wxString::Format("imagetest-%02d-exp.png", i), wxBITMAP_TYPE_PNG);
|
|
|
|
CPPUNIT_ASSERT_EQUAL( actual.GetSize().x, expected.GetSize().x );
|
|
CPPUNIT_ASSERT_EQUAL( actual.GetSize().y, expected.GetSize().y );
|
|
|
|
const unsigned data_len = 3 * expected.GetHeight() * expected.GetWidth();
|
|
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Resize test #%u: (%d, %d), (%d, %d)", i, st.w, st.h, st.dx, st.dy),
|
|
memcmp(actual.GetData(), expected.GetData(), data_len) == 0
|
|
);
|
|
}
|
|
}
|
|
|
|
void ImageTestCase::CompareLoadedImage()
|
|
{
|
|
wxImage expected8("horse.xpm");
|
|
CPPUNIT_ASSERT( expected8.IsOk() );
|
|
|
|
wxImage expected24("horse.png");
|
|
CPPUNIT_ASSERT( expected24.IsOk() );
|
|
|
|
const size_t dataLen = expected8.GetWidth() * expected8.GetHeight() * 3;
|
|
|
|
for (size_t i=0; i<WXSIZEOF(g_testfiles); i++)
|
|
{
|
|
if ( !(g_testfiles[i].bitDepth == 8 || g_testfiles[i].bitDepth == 24)
|
|
|| g_testfiles[i].type == wxBITMAP_TYPE_JPEG /*skip lossy JPEG*/)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
wxImage actual(g_testfiles[i].file);
|
|
|
|
if ( actual.GetSize() != expected8.GetSize() )
|
|
{
|
|
continue;
|
|
}
|
|
|
|
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Compare test '%s' for loading failed", g_testfiles[i].file),
|
|
|
|
memcmp(actual.GetData(),
|
|
(g_testfiles[i].bitDepth == 8)
|
|
? expected8.GetData()
|
|
: expected24.GetData(),
|
|
dataLen) == 0
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
enum
|
|
{
|
|
wxIMAGE_HAVE_ALPHA = (1 << 0),
|
|
wxIMAGE_HAVE_PALETTE = (1 << 1)
|
|
};
|
|
|
|
static
|
|
void CompareImage(const wxImageHandler& handler, const wxImage& image,
|
|
int properties = 0, const wxImage *compareTo = NULL)
|
|
{
|
|
wxBitmapType type = handler.GetType();
|
|
|
|
const bool testPalette = (properties & wxIMAGE_HAVE_PALETTE) != 0;
|
|
/*
|
|
This is getting messy and should probably be transformed into a table
|
|
with image format features before it gets hairier.
|
|
*/
|
|
if ( testPalette
|
|
&& ( !(type == wxBITMAP_TYPE_BMP
|
|
|| type == wxBITMAP_TYPE_GIF
|
|
|| type == wxBITMAP_TYPE_PNG)
|
|
|| type == wxBITMAP_TYPE_XPM) )
|
|
{
|
|
return;
|
|
}
|
|
|
|
const bool testAlpha = (properties & wxIMAGE_HAVE_ALPHA) != 0;
|
|
if (testAlpha
|
|
&& !(type == wxBITMAP_TYPE_PNG || type == wxBITMAP_TYPE_TGA) )
|
|
{
|
|
// don't test images with alpha if this handler doesn't support alpha
|
|
return;
|
|
}
|
|
|
|
if (type == wxBITMAP_TYPE_JPEG /* skip lossy JPEG */
|
|
|| type == wxBITMAP_TYPE_TIF)
|
|
{
|
|
/*
|
|
TIFF is skipped because the memory stream can't be loaded. Libtiff
|
|
looks for a TIFF directory at offset 120008 while the memory
|
|
stream size is only 120008 bytes (when saving as a file
|
|
the file size is 120280 bytes).
|
|
*/
|
|
return;
|
|
}
|
|
|
|
wxMemoryOutputStream memOut;
|
|
if ( !image.SaveFile(memOut, type) )
|
|
{
|
|
// Unfortunately we can't know if the handler just doesn't support
|
|
// saving images, or if it failed to save.
|
|
return;
|
|
}
|
|
|
|
wxMemoryInputStream memIn(memOut);
|
|
CPPUNIT_ASSERT(memIn.IsOk());
|
|
|
|
wxImage actual(memIn);
|
|
CPPUNIT_ASSERT(actual.IsOk());
|
|
|
|
const wxImage *expected = compareTo ? compareTo : ℑ
|
|
CPPUNIT_ASSERT( actual.GetSize() == expected->GetSize() );
|
|
|
|
unsigned bitsPerPixel = testPalette ? 8 : (testAlpha ? 32 : 24);
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Compare test '%s (%d-bit)' for saving failed",
|
|
handler.GetExtension(), bitsPerPixel),
|
|
|
|
memcmp(actual.GetData(), expected->GetData(),
|
|
expected->GetWidth() * expected->GetHeight() * 3) == 0
|
|
);
|
|
|
|
#if wxUSE_PALETTE
|
|
CPPUNIT_ASSERT(actual.HasPalette()
|
|
== (testPalette || type == wxBITMAP_TYPE_XPM));
|
|
#endif
|
|
|
|
CPPUNIT_ASSERT( actual.HasAlpha() == testAlpha);
|
|
|
|
if (!testAlpha)
|
|
{
|
|
return;
|
|
}
|
|
|
|
WX_ASSERT_MESSAGE
|
|
(
|
|
("Compare alpha test '%s' for saving failed", handler.GetExtension()),
|
|
|
|
memcmp(actual.GetAlpha(), expected->GetAlpha(),
|
|
expected->GetWidth() * expected->GetHeight()) == 0
|
|
);
|
|
}
|
|
|
|
void ImageTestCase::CompareSavedImage()
|
|
{
|
|
// FIXME-VC6: Pre-declare the loop variables for compatibility with
|
|
// pre-standard compilers such as MSVC6 that don't implement proper scope
|
|
// for the variables declared in the for loops.
|
|
int i, x, y;
|
|
|
|
wxImage expected24("horse.png");
|
|
CPPUNIT_ASSERT( expected24.IsOk() );
|
|
CPPUNIT_ASSERT( !expected24.HasAlpha() );
|
|
|
|
unsigned long numColours = expected24.CountColours();
|
|
wxImage expected8 = expected24.ConvertToGreyscale();
|
|
numColours = expected8.CountColours();
|
|
|
|
#if wxUSE_PALETTE
|
|
unsigned char greys[256];
|
|
for (i = 0; i < 256; ++i)
|
|
{
|
|
greys[i] = i;
|
|
}
|
|
wxPalette palette(256, greys, greys, greys);
|
|
expected8.SetPalette(palette);
|
|
#endif // #if wxUSE_PALETTE
|
|
|
|
expected8.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP_PALETTE);
|
|
|
|
// Create an image with alpha based on the loaded image
|
|
wxImage expected32(expected24);
|
|
expected32.SetAlpha();
|
|
|
|
int width = expected32.GetWidth();
|
|
int height = expected32.GetHeight();
|
|
for (y = 0; y < height; ++y)
|
|
{
|
|
for (x = 0; x < width; ++x)
|
|
{
|
|
expected32.SetAlpha(x, y, (x*y) & wxIMAGE_ALPHA_OPAQUE);
|
|
}
|
|
}
|
|
|
|
const wxList& list = wxImage::GetHandlers();
|
|
for ( wxList::compatibility_iterator node = list.GetFirst();
|
|
node; node = node->GetNext() )
|
|
{
|
|
wxImageHandler *handler = (wxImageHandler *) node->GetData();
|
|
|
|
#if wxUSE_PALETTE
|
|
CompareImage(*handler, expected8, wxIMAGE_HAVE_PALETTE);
|
|
#endif
|
|
CompareImage(*handler, expected24);
|
|
CompareImage(*handler, expected32, wxIMAGE_HAVE_ALPHA);
|
|
}
|
|
|
|
|
|
expected8.LoadFile("horse.gif");
|
|
CPPUNIT_ASSERT( expected8.IsOk() );
|
|
#if wxUSE_PALETTE
|
|
CPPUNIT_ASSERT( expected8.HasPalette() );
|
|
#endif // #if wxUSE_PALETTE
|
|
|
|
expected8.SetAlpha();
|
|
|
|
width = expected8.GetWidth();
|
|
height = expected8.GetHeight();
|
|
for (y = 0; y < height; ++y)
|
|
{
|
|
for (x = 0; x < width; ++x)
|
|
{
|
|
expected8.SetAlpha(x, y, (x*y) & wxIMAGE_ALPHA_OPAQUE);
|
|
}
|
|
}
|
|
|
|
/*
|
|
Explicitly make known we want a palettised PNG. If we don't then this
|
|
particular image gets saved as a true colour image because there's an
|
|
alpha channel present and the PNG saver prefers to keep the alpha over
|
|
saving as a palettised image that has alpha converted to a mask.
|
|
*/
|
|
expected8.SetOption(wxIMAGE_OPTION_PNG_FORMAT, wxPNG_TYPE_PALETTE);
|
|
|
|
/*
|
|
The image contains 256 indexed colours and needs another palette entry
|
|
for storing the transparency index. This results in wanting 257 palette
|
|
entries but that amount is not supported by PNG, as such this image
|
|
should not contain a palette (but still have alpha) and be stored as a
|
|
true colour image instead.
|
|
*/
|
|
CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG),
|
|
expected8, wxIMAGE_HAVE_ALPHA);
|
|
|
|
#if wxUSE_PALETTE
|
|
/*
|
|
Now do the same test again but remove one (random) palette entry. This
|
|
should result in saving the PNG with a palette.
|
|
*/
|
|
unsigned char red[256], green[256], blue[256];
|
|
const wxPalette& pal = expected8.GetPalette();
|
|
const int paletteCount = pal.GetColoursCount();
|
|
for (i = 0; i < paletteCount; ++i)
|
|
{
|
|
expected8.GetPalette().GetRGB(i, &red[i], &green[i], &blue[i]);
|
|
}
|
|
wxPalette newPal(paletteCount - 1, red, green, blue);
|
|
expected8.Replace(
|
|
red[paletteCount-1], green[paletteCount-1], blue[paletteCount-1],
|
|
red[paletteCount-2], green[paletteCount-2], blue[paletteCount-2]);
|
|
|
|
expected8.SetPalette(newPal);
|
|
|
|
wxImage ref8 = expected8;
|
|
|
|
/*
|
|
Convert the alpha channel to a mask like the PNG saver does. Also convert
|
|
the colour used for transparency from 1,0,0 to 2,0,0. The latter gets
|
|
done by the PNG loader in search of an unused colour to use for
|
|
transparency (this should be fixed).
|
|
*/
|
|
ref8.ConvertAlphaToMask();
|
|
ref8.Replace(1, 0, 0, 2, 0, 0);
|
|
|
|
CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG),
|
|
expected8, wxIMAGE_HAVE_PALETTE, &ref8);
|
|
#endif
|
|
}
|
|
|
|
#endif //wxUSE_IMAGE
|
|
|
|
|
|
/*
|
|
TODO: add lots of more tests to wxImage functions
|
|
*/
|