Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing effects of my lack of English skills: GetImagesCount back to GetImageCount

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-02 17:09:43 +00:00
parent f02ff0a7bd
commit 649d13e837
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/latex/wx/image.tex
View File

@@ -324,11 +324,11 @@ chararcters in RGBGBRGB... format.
Returns the green intensity at the given coordinate. Returns the green intensity at the given coordinate.
\membersection{wxImage::GetImagesCount}\label{wximagegetimagescount} \membersection{wxImage::GetImageCount}\label{wximagegetimagecount}
\func{static int}{GetImagesCount}{\param{const wxString\&}{ filename}, \param{long}{ type = wxBITMAP\_TYPE\_ANY}} \func{static int}{GetImageCount}{\param{const wxString\&}{ filename}, \param{long}{ type = wxBITMAP\_TYPE\_ANY}}
\func{static int}{GetImagesCount}{\param{wxInputStream\&}{ stream}, \param{long}{ type = wxBITMAP\_TYPE\_ANY}} \func{static int}{GetImageCount}{\param{wxInputStream\&}{ stream}, \param{long}{ type = wxBITMAP\_TYPE\_ANY}}
If the image file contains more than one image and the image handler is capable If the image file contains more than one image and the image handler is capable
of retrieving these individually, this function will return the number of of retrieving these individually, this function will return the number of
@@ -943,9 +943,9 @@ Gets the name of this handler.
Gets the file extension associated with this handler. Gets the file extension associated with this handler.
\membersection{wxImageHandler::GetImagesCount}\label{wximagehandlergetimagescount} \membersection{wxImageHandler::GetImageCount}\label{wximagehandlergetimagecount}
\func{int}{GetImagesCount}{\param{wxInputStream\&}{ stream}} \func{int}{GetImageCount}{\param{wxInputStream\&}{ stream}}
If the image file contains more than one image and the image handler is capable If the image file contains more than one image and the image handler is capable
of retrieving these individually, this function will return the number of of retrieving these individually, this function will return the number of

2
include/wx/imagbmp.h
View File

@@ -87,7 +87,7 @@ public:
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
virtual bool DoCanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
virtual int GetImagesCount( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream );
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
private: private:

6
include/wx/image.h
View File

@@ -46,7 +46,7 @@ public:
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual int GetImagesCount( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream );
bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); } bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
bool CanRead( const wxString& name ); bool CanRead( const wxString& name );
@@ -164,13 +164,13 @@ public:
unsigned char mr, unsigned char mg, unsigned char mb); unsigned char mr, unsigned char mg, unsigned char mb);
static bool CanRead( const wxString& name ); static bool CanRead( const wxString& name );
static int GetImagesCount( const wxString& name, long type = wxBITMAP_TYPE_ANY ); static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 ); virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 );
#if wxUSE_STREAMS #if wxUSE_STREAMS
static bool CanRead( wxInputStream& stream ); static bool CanRead( wxInputStream& stream );
static int GetImagesCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY ); static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 ); virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ); virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
#endif #endif

2
include/wx/imagtiff.h
View File

@@ -40,7 +40,7 @@ public:
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool DoCanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
virtual int GetImagesCount( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream );
#endif #endif
}; };
#endif #endif

2
src/common/imagbmp.cpp
View File

@@ -1174,7 +1174,7 @@ bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
return bResult; return bResult;
} }
int wxICOHandler::GetImagesCount(wxInputStream& stream) int wxICOHandler::GetImageCount(wxInputStream& stream)
{ {
ICONDIR IconDir; ICONDIR IconDir;
stream.SeekI(0); stream.SeekI(0);

14
src/common/image.cpp
View File

@@ -970,11 +970,11 @@ bool wxImage::CanRead( const wxString &name )
#endif #endif
} }
int wxImage::GetImagesCount( const wxString &name, long type ) int wxImage::GetImageCount( const wxString &name, long type )
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
wxFileInputStream stream(name); wxFileInputStream stream(name);
return GetImagesCount(stream, type); return GetImageCount(stream, type);
#else #else
return 0; return 0;
#endif #endif
@@ -996,7 +996,7 @@ bool wxImage::CanRead( wxInputStream &stream )
return FALSE; return FALSE;
} }
int wxImage::GetImagesCount( wxInputStream &stream, long type ) int wxImage::GetImageCount( wxInputStream &stream, long type )
{ {
wxImageHandler *handler; wxImageHandler *handler;
@@ -1008,7 +1008,7 @@ int wxImage::GetImagesCount( wxInputStream &stream, long type )
{ {
handler=(wxImageHandler*)node->GetData(); handler=(wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) ) if ( handler->CanRead(stream) )
return handler->GetImagesCount(stream); return handler->GetImageCount(stream);
} }
@@ -1026,7 +1026,7 @@ int wxImage::GetImagesCount( wxInputStream &stream, long type )
if ( handler->CanRead(stream) ) if ( handler->CanRead(stream) )
{ {
return handler->GetImagesCount(stream); return handler->GetImageCount(stream);
} }
else else
{ {
@@ -1086,7 +1086,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
return FALSE; return FALSE;
} }
return handler->LoadFile( this, stream, index ); return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
} }
bool wxImage::SaveFile( wxOutputStream& stream, int type ) bool wxImage::SaveFile( wxOutputStream& stream, int type )
@@ -1239,7 +1239,7 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE
return FALSE; return FALSE;
} }
int wxImageHandler::GetImagesCount( wxInputStream& WXUNUSED(stream) ) int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
{ {
return 1; return 1;
} }

2
src/common/imagtiff.cpp
View File

@@ -271,7 +271,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
return TRUE; return TRUE;
} }
int wxTIFFHandler::GetImagesCount( wxInputStream& stream ) int wxTIFFHandler::GetImageCount( wxInputStream& stream )
{ {
TIFF *tif = TIFFwxOpen( stream, "image", "r" ); TIFF *tif = TIFFwxOpen( stream, "image", "r" );