// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "image.h"
#endif
#include "wx/intl.h"
#include "wx/module.h"
#include "wx/hash.h"
+#include "wx/utils.h"
// For memcpy
#include <string.h>
m_maskRed = 0;
m_maskGreen = 0;
m_maskBlue = 0;
- m_hasMask = FALSE;
+ m_hasMask = false;
- m_ok = FALSE;
- m_static = FALSE;
+ m_ok = false;
+ m_static = false;
}
wxImageRefData::~wxImageRefData()
{
}
-wxImage::wxImage( int width, int height )
+wxImage::wxImage( int width, int height, bool clear )
{
- Create( width, height );
+ Create( width, height, clear );
}
wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
if (image) Ref(*image);
}
-void wxImage::Create( int width, int height )
+bool wxImage::Create( int width, int height, bool clear )
{
UnRef();
m_refData = new wxImageRefData();
M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
- if (M_IMGDATA->m_data)
- {
- for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;
-
- M_IMGDATA->m_width = width;
- M_IMGDATA->m_height = height;
- M_IMGDATA->m_ok = TRUE;
- }
- else
+ if (!M_IMGDATA->m_data)
{
UnRef();
+ return false;
}
+
+ if (clear)
+ memset(M_IMGDATA->m_data, 0, width*height*3);
+
+ M_IMGDATA->m_width = width;
+ M_IMGDATA->m_height = height;
+ M_IMGDATA->m_ok = true;
+
+ return true;
}
-void wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )
{
UnRef();
+ wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
m_refData = new wxImageRefData();
M_IMGDATA->m_data = data;
- if (M_IMGDATA->m_data)
- {
- M_IMGDATA->m_width = width;
- M_IMGDATA->m_height = height;
- M_IMGDATA->m_ok = TRUE;
- M_IMGDATA->m_static = static_data;
- }
- else
- {
- UnRef();
- }
+ M_IMGDATA->m_width = width;
+ M_IMGDATA->m_height = height;
+ M_IMGDATA->m_ok = true;
+ M_IMGDATA->m_static = static_data;
+
+ return true;
}
void wxImage::Destroy()
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+ image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
unsigned char *data = image.GetData();
memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
+ // also copy the image options
+ wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
+ imgData->m_optionNames = M_IMGDATA->m_optionNames;
+ imgData->m_optionValues = M_IMGDATA->m_optionValues;
+
return image;
}
{
if( xFactor == 1 && yFactor == 1 )
return Copy() ;
-
+
wxImage image;
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
long old_height = M_IMGDATA->m_height,
old_width = M_IMGDATA->m_width;
-
+
wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
wxT("invalid old image size") );
long width = old_width / xFactor ;
long height = old_height / yFactor ;
- image.Create( width , height );
+ image.Create( width, height, false );
char unsigned *data = image.GetData();
maskRed = M_IMGDATA->m_maskRed;
maskGreen = M_IMGDATA->m_maskGreen;
maskBlue =M_IMGDATA->m_maskBlue ;
-
+
image.SetMaskColour( M_IMGDATA->m_maskRed,
M_IMGDATA->m_maskGreen,
M_IMGDATA->m_maskBlue );
}
char unsigned *source_data = M_IMGDATA->m_data;
char unsigned *target_data = data;
-
+
for (long y = 0; y < height; y++)
{
for (long x = 0; x < width; x++)
}
else
{
- *(target_data++) = avgRed / counter ;
- *(target_data++) = avgGreen / counter ;
- *(target_data++) = avgBlue / counter ;
+ *(target_data++) = (unsigned char)(avgRed / counter);
+ *(target_data++) = (unsigned char)(avgGreen / counter);
+ *(target_data++) = (unsigned char)(avgBlue / counter);
}
}
}
{
return ShrinkBy( old_width / width , old_height / height ) ;
}
- image.Create( width, height );
+ image.Create( width, height, false );
unsigned char *data = image.GetData();
unsigned char *source_data = M_IMGDATA->m_data;
unsigned char *target_data = data;
-#if 0
- // This is nonsense, RR.
-
- // We do (x, y) -> (x, y)*oldSize/newSize but the valid values of x and y
- // are from 0 to size-1, hence all decrement the sizes
- long old_old_width = old_width;
- old_height--;
- old_width--;
- height--;
- width--;
- for ( long j = 0; j <= height; j++ )
- {
- // don't crash for images with height == 1
- long y_offset = height ? (j * old_height / height)* old_old_width : 0;
+ long x_delta = (old_width<<16) / width;
+ long y_delta = (old_height<<16) / height;
- for ( long i = 0; i <= width; i++ )
- {
- long x_offset = width ? (i * old_width) / width : 0;
+ unsigned char* dest_pixel = target_data;
- memcpy( target_data, source_data + 3*(y_offset + x_offset), 3 );
- target_data += 3;
- }
- }
-#else
- for (long j = 0; j < height; j++)
- {
- long y_offset = (j * old_height / height) * old_width;
+ long y = 0;
+ for ( long j = 0; j < height; j++ )
+ {
+ unsigned char* src_line = &source_data[(y>>16)*old_width*3];
- for (long i = 0; i < width; i++)
+ long x = 0;
+ for ( long i = 0; i < width; i++ )
{
- memcpy( target_data,
- source_data + 3*(y_offset + ((i * old_width )/ width)),
- 3 );
- target_data += 3;
+ unsigned char* src_pixel = &src_line[(x>>16)*3];
+ dest_pixel[0] = src_pixel[0];
+ dest_pixel[1] = src_pixel[1];
+ dest_pixel[2] = src_pixel[2];
+ dest_pixel += 3;
+ x += x_delta;
}
+
+ y += y_delta;
}
-#endif
// In case this is a cursor, make sure the hotspot is scalled accordingly:
if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width );
+ image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
unsigned char *data = image.GetData();
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+ image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
unsigned char *data = image.GetData();
int subwidth=rect.GetWidth();
const int subheight=rect.GetHeight();
- image.Create( subwidth, subheight );
+ image.Create( subwidth, subheight, false );
unsigned char *subdata = image.GetData(), *data=GetData();
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height );
+ image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
unsigned char *data = image.GetData();
newRefData->m_width = M_IMGDATA->m_width;
newRefData->m_height = M_IMGDATA->m_height;
newRefData->m_data = data;
- newRefData->m_ok = TRUE;
+ newRefData->m_ok = true;
newRefData->m_maskRed = M_IMGDATA->m_maskRed;
newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
newRefData->m_width = new_width;
newRefData->m_height = new_height;
newRefData->m_data = data;
- newRefData->m_ok = TRUE;
+ newRefData->m_ok = true;
newRefData->m_maskRed = M_IMGDATA->m_maskRed;
newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
newRefData->m_width = new_width;
newRefData->m_height = new_height;
newRefData->m_data = data;
- newRefData->m_ok = TRUE;
+ newRefData->m_ok = true;
}
UnRef();
M_IMGDATA->m_alpha[y*w + x] = alpha;
}
-unsigned char wxImage::GetAlpha(int x, int y)
+unsigned char wxImage::GetAlpha(int x, int y) const
{
wxCHECK_MSG( Ok() && HasAlpha(), 0, wxT("invalid image or no alpha channel") );
if ( !alpha )
{
- alpha = (unsigned char *)
- malloc(M_IMGDATA->m_width*M_IMGDATA->m_height*3);
+ alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
}
- delete [] M_IMGDATA->m_alpha;
+ free(M_IMGDATA->m_alpha);
M_IMGDATA->m_alpha = alpha;
}
M_IMGDATA->m_maskRed = r;
M_IMGDATA->m_maskGreen = g;
M_IMGDATA->m_maskBlue = b;
- M_IMGDATA->m_hasMask = TRUE;
+ M_IMGDATA->m_hasMask = true;
}
unsigned char wxImage::GetMaskRed() const
bool wxImage::HasMask() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid image") );
return M_IMGDATA->m_hasMask;
}
// check that the images are the same size
if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
{
- wxLogError( _("Image and Mask have different sizes") );
- return FALSE;
+ wxLogError( _("Image and mask have different sizes.") );
+ return false;
}
// find unused colour
unsigned char r,g,b ;
if (!FindFirstUnusedColour(&r, &g, &b))
{
- wxLogError( _("No Unused Color in image being masked") );
- return FALSE ;
+ wxLogError( _("No unused colour in image being masked.") );
+ return false ;
}
unsigned char *imgdata = GetData();
}
SetMaskColour(r, g, b);
- SetMask(TRUE);
+ SetMask(true);
+
+ return true;
+}
+
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
+{
+ if (!HasAlpha())
+ return true;
+
+ unsigned char mr, mg, mb;
+ if (!FindFirstUnusedColour(&mr, &mg, &mb))
+ {
+ wxLogError( _("No unused colour in image being masked.") );
+ return false;
+ }
+
+ SetMask(true);
+ SetMaskColour(mr, mg, mb);
+
+ unsigned char *imgdata = GetData();
+ unsigned char *alphadata = GetAlpha();
- return TRUE;
+ int w = GetWidth();
+ int h = GetHeight();
+
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
+ {
+ if (*alphadata < threshold)
+ {
+ imgdata[0] = mr;
+ imgdata[1] = mg;
+ imgdata[2] = mb;
+ }
+ }
+ }
+
+ free(M_IMGDATA->m_alpha);
+ M_IMGDATA->m_alpha = NULL;
+
+ return true;
}
#if wxUSE_PALETTE
bool wxImage::HasPalette() const
{
if (!Ok())
- return FALSE;
+ return false;
return M_IMGDATA->m_palette.Ok();
}
{
wxCHECK_RET( Ok(), wxT("invalid image") );
- int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+ int idx = M_IMGDATA->m_optionNames.Index(name, false);
if (idx == wxNOT_FOUND)
{
M_IMGDATA->m_optionNames.Add(name);
{
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
- int idx = M_IMGDATA->m_optionNames.Index(name, FALSE);
+ int idx = M_IMGDATA->m_optionNames.Index(name, false);
if (idx == wxNOT_FOUND)
return wxEmptyString;
else
bool wxImage::HasOption(const wxString& name) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid image") );
- return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
+ return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);
}
bool wxImage::LoadFile( const wxString& filename, long type, int index )
{
wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
- return FALSE;
+ return false;
}
#else // !wxUSE_STREAMS
- return FALSE;
+ return false;
#endif // wxUSE_STREAMS
}
{
wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
- return FALSE;
+ return false;
}
#else // !wxUSE_STREAMS
- return FALSE;
+ return false;
#endif // wxUSE_STREAMS
}
if (pHandler)
{
SaveFile(filename, pHandler->GetType());
- return TRUE;
+ return true;
}
wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
- return FALSE;
+ return false;
}
bool wxImage::SaveFile( const wxString& filename, int type ) const
}
#endif // wxUSE_STREAMS
- return FALSE;
+ return false;
}
bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
}
#endif // wxUSE_STREAMS
- return FALSE;
+ return false;
}
bool wxImage::CanRead( const wxString &name )
wxFileInputStream stream(name);
return CanRead(stream);
#else
- return FALSE;
+ return false;
#endif
}
{
const wxList& list = GetHandlers();
- for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+ for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
{
wxImageHandler *handler=(wxImageHandler*)node->GetData();
if (handler->CanRead( stream ))
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
int wxImage::GetImageCount( wxInputStream &stream, long type )
{
wxList &list=GetHandlers();
- for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
+ for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
{
handler=(wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) )
if ( !handler )
{
wxLogWarning(_("No image handler for type %d defined."), type);
- return FALSE;
+ return false;
}
if ( handler->CanRead(stream) )
{
wxList &list=GetHandlers();
- for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
+ for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
{
handler=(wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) )
- return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+ return handler->LoadFile(this, stream, true/*verbose*/, index);
}
wxLogWarning( _("No handler found for image type.") );
- return FALSE;
+ return false;
}
handler = FindHandler(type);
{
wxLogWarning( _("No image handler for type %d defined."), type );
- return FALSE;
+ return false;
}
- return handler->LoadFile(this, stream, TRUE/*verbose*/, index);
+ return handler->LoadFile(this, stream, true/*verbose*/, index);
}
bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
- return FALSE;
+ return false;
}
- return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
+ return handler->LoadFile( this, stream, true/*verbose*/, index );
}
bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid image") );
wxImageHandler *handler = FindHandler(type);
{
wxLogWarning( _("No image handler for type %d defined."), type );
- return FALSE;
+ return false;
}
return handler->SaveFile( (wxImage*)this, stream );
bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid image") );
wxImageHandler *handler = FindHandlerMime(mimetype);
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
- return FALSE;
+ return false;
}
return handler->SaveFile( (wxImage*)this, stream );
void wxImage::AddHandler( wxImageHandler *handler )
{
- // make sure that the memory will be freed at the program end
- sm_handlers.DeleteContents(TRUE);
-
// Check for an existing handler of the type being added.
if (FindHandler( handler->GetType() ) == 0)
{
void wxImage::InsertHandler( wxImageHandler *handler )
{
- // make sure that the memory will be freed at the program end
- sm_handlers.DeleteContents(TRUE);
-
// Check for an existing handler of the type being added.
if (FindHandler( handler->GetType() ) == 0)
{
if (handler)
{
sm_handlers.DeleteObject(handler);
- return TRUE;
+ delete handler;
+ return true;
}
else
- return FALSE;
+ return false;
}
wxImageHandler *wxImage::FindHandler( const wxString& name )
{
- wxNode *node = sm_handlers.GetFirst();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler*)node->GetData();
wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
{
- wxNode *node = sm_handlers.GetFirst();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler*)node->GetData();
wxImageHandler *wxImage::FindHandler( long bitmapType )
{
- wxNode *node = sm_handlers.GetFirst();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler *)node->GetData();
wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
{
- wxNode *node = sm_handlers.GetFirst();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler *)node->GetData();
- if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
+ if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
node = node->GetNext();
}
return 0;
void wxImage::CleanUpHandlers()
{
- wxNode *node = sm_handlers.GetFirst();
+ wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler *)node->GetData();
- wxNode *next = node->GetNext();
+ wxList::compatibility_iterator next = node->GetNext();
delete handler;
- delete node;
node = next;
}
+
+ sm_handlers.Clear();
+}
+
+wxString wxImage::GetImageExtWildcard()
+{
+ wxString fmts;
+
+ wxList& Handlers = wxImage::GetHandlers();
+ wxList::compatibility_iterator Node = Handlers.GetFirst();
+ while ( Node )
+ {
+ wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+ fmts += wxT("*.") + Handler->GetExtension();
+ Node = Node->GetNext();
+ if ( Node ) fmts += wxT(";");
+ }
+
+ return wxT("(") + fmts + wxT(")|") + fmts;
}
//-----------------------------------------------------------------------------
#if wxUSE_STREAMS
bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
{
- return FALSE;
+ return false;
}
bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
{
- return FALSE;
+ return false;
}
int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
- return FALSE;
+ return false;
}
bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
if ( posOld == wxInvalidOffset )
{
// can't test unseekable stream
- return FALSE;
+ return false;
}
bool ok = DoCanRead(stream);
wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
// reading would fail anyhow as we're not at the right position
- return FALSE;
+ return false;
}
return ok;
#endif // wxUSE_STREAMS
-
-
-//-----------------------------------------------------------------------------
-// Deprecated wxBitmap conversion routines
-//-----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-#ifdef __WXGTK__
-wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
-{
- wxImage mono = this->ConvertToMono( red, green, blue );
- wxBitmap bitmap( mono, 1 );
- return bitmap;
-}
-#endif
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
- wxBitmap bitmap( *this );
- return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
- *this = bitmap.ConvertToImage();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-
-
// ----------------------------------------------------------------------------
// image histogram stuff
// ----------------------------------------------------------------------------
b2++;
if ( b2 >= 255 )
{
- wxLogError(_("GetUnusedColour:: No Unused Color in image ") );
- return FALSE;
+ wxLogError(_("No unused colour in image.") );
+ return false;
}
}
}
if ( b )
*b = b2;
- return TRUE;
+ return true;
}
bool
int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
- wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
+ wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false);
if (offset_after_rotation != NULL)
{
w3 * *(v3++) + w4 * *(v4++)) /
(w1 + w2 + w3 + w4) );
*(dst++) = (unsigned char)
- ( (w1 * *(v1++) + w2 * *(v2++) +
- w3 * *(v3++) + w4 * *(v4++)) /
+ ( (w1 * *v1 + w2 * *v2 +
+ w3 * *v3 + w4 * *v4) /
(w1 + w2 + w3 + w4) );
}
}
unsigned char *p = data[ys] + (3 * xs);
*(dst++) = *(p++);
*(dst++) = *(p++);
- *(dst++) = *(p++);
+ *(dst++) = *p;
}
else
{
DECLARE_DYNAMIC_CLASS(wxImageModule)
public:
wxImageModule() {}
- bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+ bool OnInit() { wxImage::InitStandardHandlers(); return true; };
void OnExit() { wxImage::CleanUpHandlers(); };
};
projects / wxWidgets.git / blobdiff