From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 2 Jan 2002 17:09:43 +0000 (+0000)
Subject: fixing effects of my lack of English skills: GetImagesCount back to GetImageCount
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/649d13e837b25f7b948ccfae02b18131f3a0a743

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index 84845e8189..28aadc6a22 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -324,11 +324,11 @@ chararcters in RGBGBRGB... format.
 
 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 
 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.
 
-\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 
 of retrieving these individually, this function will return the number of
diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 74132f2aed..2fbccbf619 100644
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -87,7 +87,7 @@ public:
     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 DoCanRead( wxInputStream& stream );
-    virtual int GetImagesCount( wxInputStream& stream );
+    virtual int GetImageCount( wxInputStream& stream );
 #endif // wxUSE_STREAMS
 
 private:
diff --git a/include/wx/image.h b/include/wx/image.h
index 9cee5d69f8..00d190e5c1 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -46,7 +46,7 @@ public:
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
     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( const wxString& name );
@@ -164,13 +164,13 @@ public:
                           unsigned char mr, unsigned char mg, unsigned char mb);
 
     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, const wxString& mimetype, int index = -1 );
 
 #if wxUSE_STREAMS
     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, const wxString& mimetype, int index = -1 );
 #endif
diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 6d25bf9ba3..55d3ff0689 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -40,7 +40,7 @@ public:
   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 DoCanRead( wxInputStream& stream );
-  virtual int GetImagesCount( wxInputStream& stream );
+  virtual int GetImageCount( wxInputStream& stream );
 #endif
 };
 #endif
diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index e06ba14f81..924bcf4c3d 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1174,7 +1174,7 @@ bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
     return bResult;
 }
 
-int wxICOHandler::GetImagesCount(wxInputStream& stream)
+int wxICOHandler::GetImageCount(wxInputStream& stream)
 {
     ICONDIR IconDir;
     stream.SeekI(0);
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 80ee2992d3..73f00d9f88 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -970,11 +970,11 @@ bool wxImage::CanRead( const wxString &name )
 #endif
 }
 
-int wxImage::GetImagesCount( const wxString &name, long type )
+int wxImage::GetImageCount( const wxString &name, long type )
 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);
-  return GetImagesCount(stream, type);
+  return GetImageCount(stream, type);
 #else
   return 0;
 #endif
@@ -996,7 +996,7 @@ bool wxImage::CanRead( wxInputStream &stream )
     return FALSE;
 }
 
-int wxImage::GetImagesCount( wxInputStream &stream, long type )
+int wxImage::GetImageCount( wxInputStream &stream, long type )
 {
     wxImageHandler *handler;
 
@@ -1008,7 +1008,7 @@ int wxImage::GetImagesCount( wxInputStream &stream, long type )
         {
              handler=(wxImageHandler*)node->GetData();
              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) )
     {
-        return handler->GetImagesCount(stream);
+        return handler->GetImageCount(stream);
     }
     else
     {
@@ -1086,7 +1086,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
         return FALSE;
     }
 
-    return handler->LoadFile( this, stream, index );
+    return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type )
@@ -1239,7 +1239,7 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE
     return FALSE;
 }
 
-int wxImageHandler::GetImagesCount( wxInputStream& WXUNUSED(stream) )
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
 {
     return 1;
 }
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index cf49f4aa82..989a1600a2 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -271,7 +271,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     return TRUE;
 }
 
-int wxTIFFHandler::GetImagesCount( wxInputStream& stream )
+int wxTIFFHandler::GetImageCount( wxInputStream& stream )
 {
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );