class wxImageRefData: public wxObjectRefData
{
-
public:
wxImageRefData();
~wxImageRefData();
wxImageRefData::~wxImageRefData()
{
- if (m_data) free( m_data );
+ if (m_data)
+ free( m_data );
}
wxList wxImage::sm_handlers;
#define M_IMGDATA ((wxImageRefData *)m_refData)
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
-#endif
wxImage::wxImage()
{
wxCHECK_MSG( Ok(), image, wxT("invalid image") );
- wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight())
- , image, wxT("invalid subimage size") );
+ wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+ image, wxT("invalid subimage size") );
int subwidth=rect.GetWidth();
const int subheight=rect.GetHeight();
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- return LoadFile(stream, type);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, type);
}
-
- else {
- wxLogError( wxT("Can't load image from file '%s': file does not exist."), filename.c_str() );
+ else
+ {
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- return LoadFile(stream, mimetype);
+ wxBufferedInputStream bstream( stream );
+ return LoadFile(bstream, mimetype);
}
-
- else {
- wxLogError( wxT("Can't load image from file '%s': file does not exist."), filename.c_str() );
+ else
+ {
+ wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
return FALSE;
}
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, type);
+ {
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, type);
+ }
else
#endif // wxUSE_STREAMS
return FALSE;
wxFileOutputStream stream(filename);
if ( stream.LastError() == wxStream_NOERROR )
- return SaveFile(stream, mimetype);
+ {
+ wxBufferedOutputStream bstream( stream );
+ return SaveFile(bstream, mimetype);
+ }
else
#endif // wxUSE_STREAMS
return FALSE;
}
- wxLogWarning( wxT("No handler found for this image.") );
+ wxLogWarning( _("No handler found for image type.") );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( wxT("No image handler for type %d defined."), type );
+ wxLogWarning( _("No image handler for type %d defined."), type );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( wxT("No image handler for type %s defined."), mimetype.GetData() );
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( wxT("No image handler for type %d defined."), type );
+ wxLogWarning( _("No image handler for type %d defined."), type );
return FALSE;
}
if (handler == NULL)
{
- wxLogWarning( wxT("No image handler for type %s defined."), mimetype.GetData() );
+ wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return FALSE;
}
// wxImageHandler
//-----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
-#endif
#if wxUSE_STREAMS
-bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
{
return FALSE;
}
return FALSE;
}
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
+{
+ return 1;
+}
+
bool wxImageHandler::CanRead( const wxString& name )
{
-#if wxUSE_STREAMS
if (wxFileExists(name))
{
wxFileInputStream stream(name);
}
else {
- wxLogError( wxT("Can't check image format of file '%s': file does not exist."), name.c_str() );
+ wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
return FALSE;
}
-#else // !wxUSE_STREAMS
- return FALSE;
-#endif // wxUSE_STREAMS
+// return FALSE;
}
-
-
#endif // wxUSE_STREAMS
//-----------------------------------------------------------------------------
free(lpDIBh);
free(lpBits);
+#if WXWIN_COMPATIBILITY_2
// check the wxBitmap object
- if( bitmap.GetHBITMAP() )
- bitmap.SetOk( TRUE );
- else
- bitmap.SetOk( FALSE );
+ bitmap.GetBitmapData()->SetOk();
+#endif // WXWIN_COMPATIBILITY_2
return bitmap;
}
#ifdef __WXGTK__
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
#if (GTK_MINOR_VERSION > 0)
-#include "gdk/gdkrgb.h"
+#include <gdk/gdkrgb.h>
#endif
wxBitmap wxImage::ConvertToBitmap() const
for (int i = 0; i < bitmap.GetWidth(); i++)
{
wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
- // pixel = wxINT32_SWAP_ON_BE( pixel );
if (bpp <= 8)
{
data[pos] = cmap->colors[pixel].red >> 8;
data[pos+2] = cmap->colors[pixel].blue >> 8;
} else if (bpp == 15)
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ // ?
+#endif
data[pos] = (pixel >> 7) & 0xf8;
data[pos+1] = (pixel >> 2) & 0xf8;
data[pos+2] = (pixel << 3) & 0xf8;
} else if (bpp == 16)
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ // ?
+#endif
data[pos] = (pixel >> 8) & 0xf8;
data[pos+1] = (pixel >> 3) & 0xfc;
data[pos+2] = (pixel << 3) & 0xf8;
} else
{
+#if (wxBYTE_ORDER == wxBIG_ENDIAN)
+ data[pos] = (pixel) & 0xff; // Red
+ data[pos+1] = (pixel >> 8) & 0xff; // Green
+ data[pos+2] = (pixel >> 16) & 0xff; // Blue
+#else
data[pos] = (pixel >> 16) & 0xff;
data[pos+1] = (pixel >> 8) & 0xff;
data[pos+2] = pixel & 0xff;
+#endif
}
if (gdk_image_mask)
//-----------------------------------------------------------------------------
#ifdef __WXMOTIF__
-
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/utils.h"
#include <math.h>
};
IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+
+//-----------------------------------------------------------------------------
+
+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it reaches 'stopat' different colours. This is useful, for example,
+// to see if the image can be saved as 8-bit (256 colour or less, in this
+// case it would be invoked as CountColours(257)). Default value for stopat
+// is -1 (don't care).
+//
+unsigned long wxImage::CountColours( unsigned long stopat )
+{
+ wxHashTable h;
+ wxNode *node;
+ wxHNode *hnode;
+ unsigned char r, g, b, *p;
+ unsigned long size, nentries, key;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; (j < size) && (nentries < stopat) ; j++)
+ {
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ hnode = (wxHNode *) h.Get(key);
+
+ if (!hnode)
+ {
+ h.Put(key, (wxObject *)(new wxHNode));
+ nentries++;
+ }
+ }
+
+ // delete all HNodes
+ h.BeginFind();
+ while ((node = h.Next()) != NULL)
+ delete (wxHNode *)node->GetData();
+
+ return nentries;
+}
+
+
+// GRG, Dic/99
+// Computes the histogram of the image and fills a hash table, indexed
+// with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
+// wxHNode contains an 'index' (useful to build a palette with the image
+// colours) and a 'value', which is the number of pixels in the image with
+// that colour.
+//
+unsigned long wxImage::ComputeHistogram( wxHashTable &h )
+{
+ unsigned char r, g, b, *p;
+ unsigned long size, nentries, key;
+ wxHNode *hnode;
+
+ p = GetData();
+ size = GetWidth() * GetHeight();
+ nentries = 0;
+
+ for (unsigned long j = 0; j < size; j++)
+ {
+ r = *(p++);
+ g = *(p++);
+ b = *(p++);
+ key = (r << 16) | (g << 8) | b;
+
+ hnode = (wxHNode *) h.Get(key);
+
+ if (hnode)
+ hnode->value++;
+ else
+ {
+ hnode = new wxHNode();
+ hnode->index = nentries++;
+ hnode->value = 1;
+
+ h.Put(key, (wxObject *)hnode);
+ }
+ }
+
+ return nentries;
+}
+
+
projects / wxWidgets.git / blobdiff